From d201254741cd85cb8dfe62d1907c386d56de2a47 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sun, 11 Sep 2016 17:57:11 +0200 Subject: [PATCH] sigrok-cross-linux: Add some workarounds for FreeBSD issues. --- cross-compile/linux/sigrok-cross-linux | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/cross-compile/linux/sigrok-cross-linux b/cross-compile/linux/sigrok-cross-linux index c7ae22e..2a4ff9d 100755 --- a/cross-compile/linux/sigrok-cross-linux +++ b/cross-compile/linux/sigrok-cross-linux @@ -36,6 +36,11 @@ 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" @@ -81,7 +86,7 @@ cd libsigrok ./autogen.sh mkdir build cd build -PKG_CONFIG_PATH=$P ../configure $C +PKG_CONFIG_PATH=$P ../configure $C $JDK $SB make $PARALLEL $V PYTHONPATH=$PYPATH $SB make install $V $SB make check $V @@ -128,7 +133,12 @@ cd sigrok-cli ./autogen.sh mkdir build cd build -PKG_CONFIG_PATH=$P ../configure $C +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 ../.. -- 2.30.2