X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Flinux%2Fsigrok-cross-linux;h=2e5cdc04cdd85d55eb73f05ee432edf2b1e52df4;hp=8f94d43aa32441420cd2c8242f03c8df94cc4494;hb=6e8a37a4c48156b37550a667939156039d4d6a91;hpb=cabab8f7b608d3e0183808ddbbe3fd9f9322e999

diff --git a/cross-compile/linux/sigrok-cross-linux b/cross-compile/linux/sigrok-cross-linux
index 8f94d43..2e5cdc0 100755
--- a/cross-compile/linux/sigrok-cross-linux
+++ b/cross-compile/linux/sigrok-cross-linux
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+## along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 
 set -e
@@ -36,8 +35,13 @@ 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"
+# V="V=1 VERBOSE=1"
 
 # Edit this to enable/disable/modify parallel compiles.
 PARALLEL="-j 2"
@@ -61,10 +65,12 @@ cd $BUILDDIR
 
 GIT_CLONE="git clone --depth=1"
 
+REPO_BASE="git://sigrok.org"
+
 # -----------------------------------------------------------------------------
 
 # libserialport
-$GIT_CLONE git://sigrok.org/libserialport
+$GIT_CLONE $REPO_BASE/libserialport
 cd libserialport
 ./autogen.sh
 mkdir build
@@ -76,19 +82,19 @@ cd ../..
 
 # libsigrok
 mkdir -p $PYPATH
-$GIT_CLONE git://sigrok.org/libsigrok
+$GIT_CLONE $REPO_BASE/libsigrok
 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
 cd ../..
 
 # libsigrokdecode
-$GIT_CLONE git://sigrok.org/libsigrokdecode
+$GIT_CLONE $REPO_BASE/libsigrokdecode
 cd libsigrokdecode
 ./autogen.sh
 mkdir build
@@ -100,7 +106,7 @@ $SB make check $V
 cd ../..
 
 # sigrok-firmware
-$GIT_CLONE git://sigrok.org/sigrok-firmware
+$GIT_CLONE $REPO_BASE/sigrok-firmware
 cd sigrok-firmware
 ./autogen.sh
 mkdir build
@@ -111,7 +117,7 @@ make install $V
 cd ../..
 
 # sigrok-firmware-fx2lafw
-$GIT_CLONE git://sigrok.org/sigrok-firmware-fx2lafw
+$GIT_CLONE $REPO_BASE/sigrok-firmware-fx2lafw
 cd sigrok-firmware-fx2lafw
 ./autogen.sh
 mkdir build
@@ -123,18 +129,23 @@ make install $V
 cd ../..
 
 # sigrok-cli
-$GIT_CLONE git://sigrok.org/sigrok-cli
+$GIT_CLONE $REPO_BASE/sigrok-cli
 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 ../..
 
 # PulseView
-$GIT_CLONE git://sigrok.org/pulseview
+$GIT_CLONE $REPO_BASE/pulseview
 cd pulseview
 mkdir build
 cd build