From: Frank Stettner <redacted>
Date: Mon, 27 Mar 2023 16:40:15 +0000 (+0200)
Subject: Add sigrok-firmware-fx2lafw to MXE build dependencies and fix sigrok-firmware build
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=1a108ddbf896b256bb23ef2808eec150f7e3e3b6;p=sigrok-build.git

Add sigrok-firmware-fx2lafw to MXE build dependencies and fix sigrok-firmware build
---

diff --git a/ci/sigrok-mxe-build-dependencies.sh b/ci/sigrok-mxe-build-dependencies.sh
index c867ae3..05def09 100755
--- a/ci/sigrok-mxe-build-dependencies.sh
+++ b/ci/sigrok-mxe-build-dependencies.sh
@@ -114,7 +114,18 @@ cd ..
 $GIT_CLONE $SIGROK_FIRMWARE_REPO sigrok-firmware
 cd sigrok-firmware
 ./autogen.sh
-./configure $C $L
+# Nothing gets cross-compiled here, we just need 'make install' basically.
+./configure --prefix="$INSTALL_DIR"
+make install $V
+cd ..
+
+# sigrok-firmware-fx2lafw
+
+$GIT_CLONE $SIGROK_FIRMWARE_FX2LAFW_REPO sigrok-firmware-fx2lafw
+cd sigrok-firmware-fx2lafw
+./autogen.sh
+# We're building the fx2lafw firmware on the host, no need to cross-compile.
+./configure --prefix="$INSTALL_DIR"
 make $PARALLEL $V
 make install $V
 cd ..
@@ -122,5 +133,6 @@ cd ..
 # sigrok-dumps
 $GIT_CLONE $SIGROK_DUMPS_REPO sigrok-dumps
 cd sigrok-dumps
-make PREFIX="$INSTALL_DIR" install
+make install PREFIX="$INSTALL_DIR" $V
 cd ..
+
diff --git a/ci/sigrok-mxe-init-toolchain.sh b/ci/sigrok-mxe-init-toolchain.sh
index be0cd8d..abadba4 100755
--- a/ci/sigrok-mxe-init-toolchain.sh
+++ b/ci/sigrok-mxe-init-toolchain.sh
@@ -34,6 +34,7 @@ P="$INSTALL_DIR/lib/pkgconfig"
 P2="$MXE_DIR/usr/$TOOLCHAIN_TRIPLET/lib/pkgconfig"
 export C="--host=$TOOLCHAIN_TRIPLET --prefix=$INSTALL_DIR CPPFLAGS=-D__printf__=__gnu_printf__"
 export L="--disable-shared --enable-static"
+#export V="V=1 VERBOSE=1"
 
 if [ "$TARGET" = "i686" ]; then
 	export PKG_CONFIG_PATH_i686_w64_mingw32_static_posix="$P:$P2"