sigrok-cross-linux: Add some workarounds for FreeBSD 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 a01173ab7c37aa97f8073ecae9f88c33cbaa2a03..2a4ff9da9137de1c872011e318fd061dcc8fe8e5 100755 (executable)
--- a/cross-compile/linux/sigrok-cross-linux
+++ b/cross-compile/linux/sigrok-cross-linux
@@ -36,6 +36,14 @@ BUILDDIR=./build
 # The path where the libsigrok Python bindings will be installed.
 PYPATH=$PREFIX/lib/python2.7/site-packages
 
+# JDK include path. Usually found automatically, except on FreeBSD.
+if [ `uname` = "FreeBSD" ]; then
+       JDK="--with-jni-include-path=/usr/local/openjdk7/include"
+fi
+
+# Edit this to control verbose build output.
+# V="V=1 VERBOSE=1"
+
 # Edit this to enable/disable/modify parallel compiles.
 PARALLEL="-j 2"
 
@@ -67,8 +75,8 @@ cd libserialport
 mkdir build
 cd build
 ../configure $C
-$SB make $PARALLEL
-make install
+$SB make $PARALLEL $V
+make install $V
 cd ../..
 
 # libsigrok
@@ -78,10 +86,10 @@ cd libsigrok
 ./autogen.sh
 mkdir build
 cd build
-PKG_CONFIG_PATH=$P ../configure $C
-$SB make $PARALLEL
-PYTHONPATH=$PYPATH $SB make install
-$SB make check
+PKG_CONFIG_PATH=$P ../configure $C $JDK
+$SB make $PARALLEL $V
+PYTHONPATH=$PYPATH $SB make install $V
+$SB make check $V
 cd ../..
 
 # libsigrokdecode
@@ -91,9 +99,9 @@ cd libsigrokdecode
 mkdir build
 cd build
 PKG_CONFIG_PATH=$P ../configure $C
-$SB make $PARALLEL
-make install
-$SB make check
+$SB make $PARALLEL $V
+make install $V
+$SB make check $V
 cd ../..
 
 # sigrok-firmware
@@ -104,7 +112,7 @@ mkdir build
 cd build
 # Nothing gets cross-compiled here, we just need 'make install' basically.
 ../configure $C
-make install
+make install $V
 cd ../..
 
 # sigrok-firmware-fx2lafw
@@ -115,8 +123,8 @@ mkdir build
 cd build
 # We're building the fx2lafw firmware on the host, no need to cross-compile.
 ../configure $C
-make $PARALLEL
-make install
+make $PARALLEL $V
+make install $V
 cd ../..
 
 # sigrok-cli
@@ -125,9 +133,14 @@ cd sigrok-cli
 ./autogen.sh
 mkdir build
 cd build
-PKG_CONFIG_PATH=$P ../configure $C
-$SB make $PARALLEL
-make install
+if [ `uname` = "FreeBSD" ]; then
+       # Temporary fix for: http://sigrok.org/bugzilla/show_bug.cgi?id=552
+       PKG_CONFIG_PATH=$P ../configure $C LDFLAGS=-lusb
+else
+       PKG_CONFIG_PATH=$P ../configure $C
+fi
+$SB make $PARALLEL $V
+make install $V
 cd ../..
 
 # PulseView
@@ -136,8 +149,7 @@ cd pulseview
 mkdir build
 cd build
 PKG_CONFIG_PATH=$P $SB cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_TESTS=y ..
-$SB make $PARALLEL
-make install
-$SB make test
+$SB make $PARALLEL $V
+make install $V
+$SB make test $V
 cd ../..
-