From: Uwe Hermann <redacted>
Date: Sat, 17 Nov 2018 19:39:59 +0000 (+0100)
Subject: Bump required sdcc version to >= 3.4.0.
X-Git-Tag: sigrok-firmware-fx2lafw-0.1.7~8
X-Git-Url: https://sigrok.org/gitweb/?a=commitdiff_plain;h=fac71cc2015cd5ca9fbec4dd19fdf44c8206e246;p=sigrok-firmware-fx2lafw.git

Bump required sdcc version to >= 3.4.0.

There is an issue with some sdcc versions that causes problems, e.g. only
the first scan for an FX2 device succeeds, the second one yields
LIBUSB_ERROR_PIPE (see bug #1326).

Recent tests have shown that sdcc 3.3.0 produces broken fx2lafw firmware
files, and sdcc 3.1.0 errors out during the build. Versions 3.4.0, 3.5.0,
3.6.9, and 3.8.0 (for example) all seem to work fine.

Thus, increase the minimum required sdcc version to 3.4.0.

This fixes bug #1326.
---

diff --git a/README b/README
index e0d25a11..43105dc5 100644
--- a/README
+++ b/README
@@ -25,16 +25,7 @@ Requirements
  - make
  - autoconf >= 2.63
  - automake >= 1.11
- - sdcc (>= 2.9.0)
-
-Notes:
-
- - In order to build fx2lafw you need the 'sdcc' compiler (>= 2.9.0).
-   On Debian you can install it via:
-
-     $ apt-get install sdcc
-
-   This project has been tested to work with sdcc 2.9 and 3.x.
+ - sdcc (>= 3.4.0)
 
 
 Building and installing
diff --git a/configure.ac b/configure.ac
index bbd68fc1..b3c7f3eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,8 +42,8 @@ AS_IF([test "x$SDCCLIB" = x],
 	[AC_MSG_ERROR([cannot find sdcclib.])])
 
 sf_sdcc_version=`$SDCC --version | sed -n 's/.* \([[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\) .*/\1/p;q' 2>&AS_MESSAGE_LOG_FD`
-AS_VERSION_COMPARE([$sf_sdcc_version], [2.9.0],
-	[AC_MSG_ERROR([At least version 2.9.0 of sdcc is required.])])
+AS_VERSION_COMPARE([$sf_sdcc_version], [3.4.0],
+	[AC_MSG_ERROR([At least version 3.4.0 of sdcc is required.])])
 
 AC_CHECK_PROGS([OBJCOPY], [objcopy])
 AC_CHECK_PROGS([MAKEBIN], [makebin sdcc-makebin])