X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Flinux%2Fsigrok-cross-linux;h=7c7767cf348696fb73676519537ee8c6788c4da4;hp=8db6f486e8f8dc96a6499afec74634910820a1d1;hb=473d0272a2e55f2019de0af6460663fd99e10e5b;hpb=803377fc73119c7da421b92f66d39accff24e92f

diff --git a/cross-compile/linux/sigrok-cross-linux b/cross-compile/linux/sigrok-cross-linux
index 8db6f48..7c7767c 100755
--- 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=0
+
 # 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