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

diff --git a/cross-compile/linux/sigrok-cross-linux b/cross-compile/linux/sigrok-cross-linux
index 8f94d43..9e55155 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"
@@ -81,7 +85,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 +132,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 ../..