sigrok-cross-mingw: Update MXE patch to fix various issues.

[sigrok-util.git] / cross-compile / linux / sigrok-cross-linux

diff --git a/cross-compile/linux/sigrok-cross-linux b/cross-compile/linux/sigrok-cross-linux
index 2e5cdc04cdd85d55eb73f05ee432edf2b1e52df4..6ba70378a02fe2ecdd06e5d0a9103db301730f4f 100755 (executable)
--- a/cross-compile/linux/sigrok-cross-linux
+++ b/cross-compile/linux/sigrok-cross-linux
@@ -46,6 +46,9 @@ fi
 # Edit this to enable/disable/modify parallel compiles.
 PARALLEL="-j 2"
 
+# Edit this to enable/disable building certain components.
+BUILD_SIGROK_FIRMWARE_FX2LAFW=1
+
 # Uncomment the following lines to build with clang and run scan-build.
 # export CC=clang
 # export CXX=clang++
@@ -75,7 +78,7 @@ cd libserialport
 ./autogen.sh
 mkdir build
 cd build
-../configure $C
+$SB ../configure $C
 $SB make $PARALLEL $V
 make install $V
 cd ../..
@@ -87,7 +90,7 @@ cd libsigrok
 ./autogen.sh
 mkdir build
 cd build
-PKG_CONFIG_PATH=$P ../configure $C $JDK
+PKG_CONFIG_PATH=$P $SB ../configure $C $JDK
 $SB make $PARALLEL $V
 PYTHONPATH=$PYPATH $SB make install $V
 $SB make check $V
@@ -99,7 +102,7 @@ cd libsigrokdecode
 ./autogen.sh
 mkdir build
 cd build
-PKG_CONFIG_PATH=$P ../configure $C
+PKG_CONFIG_PATH=$P $SB ../configure $C
 $SB make $PARALLEL $V
 make install $V
 $SB make check $V
@@ -112,10 +115,11 @@ cd sigrok-firmware
 mkdir build
 cd build
 # Nothing gets cross-compiled here, we just need 'make install' basically.
-../configure $C
+$SB ../configure $C
 make install $V
 cd ../..
 
+if [ $BUILD_SIGROK_FIRMWARE_FX2LAFW = 1 ]; then
 # sigrok-firmware-fx2lafw
 $GIT_CLONE $REPO_BASE/sigrok-firmware-fx2lafw
 cd sigrok-firmware-fx2lafw
@@ -123,10 +127,11 @@ cd sigrok-firmware-fx2lafw
 mkdir build
 cd build
 # We're building the fx2lafw firmware on the host, no need to cross-compile.
-../configure $C
+$SB ../configure $C
 make $PARALLEL $V
 make install $V
 cd ../..
+fi
 
 # sigrok-cli
 $GIT_CLONE $REPO_BASE/sigrok-cli
@@ -136,9 +141,9 @@ mkdir build
 cd build
 if [ `uname` = "FreeBSD" ]; then
        # Temporary fix for: http://sigrok.org/bugzilla/show_bug.cgi?id=552
-       PKG_CONFIG_PATH=$P ../configure $C LDFLAGS=-lusb
+       PKG_CONFIG_PATH=$P $SB ../configure $C LDFLAGS=-lusb
 else
-       PKG_CONFIG_PATH=$P ../configure $C
+       PKG_CONFIG_PATH=$P $SB ../configure $C
 fi
 $SB make $PARALLEL $V
 make install $V
@@ -149,7 +154,7 @@ $GIT_CLONE $REPO_BASE/pulseview
 cd pulseview
 mkdir build
 cd build
-PKG_CONFIG_PATH=$P $SB cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_TESTS=y ..
+PKG_CONFIG_PATH=$P $SB cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_TESTS=y -DCMAKE_EXPORT_COMPILE_COMMANDS=y ..
 $SB make $PARALLEL $V
 make install $V
 $SB make test $V