X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=2dcfc29ad181c06139f6632ee0a78c50c9b9e8a6;hb=2475da729040ce8a7b032ca569c373d68d08e612;hp=f6ea322f0dfcb05313c536e83a265813c3b9b8e5;hpb=13b2dfdc90c4533b3bd651ef79f5bc2c40422f5d;p=sigrok-util.git

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index f6ea322..2dcfc29 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -35,12 +35,12 @@ BUILDDIR=./sr_android_build
 # -----------------------------------------------------------------------------
 
 VER_LIBICONV=1.14
-VER_GETTEXT=0.18.2
+VER_GETTEXT=0.18.3
 VER_ZLIB=1.2.8
-VER_PCRE=8.32
-VER_LIBFFI=3.0.11
+VER_PCRE=8.33
+VER_LIBFFI=3.0.13
 VER_GLIB=2.34.3
-VER_LIBZIP=0.10.1
+VER_LIBZIP=0.11.1
 VER_LIBUSB=0.1.12
 VER_LIBFTDI=0.20
 VER_LIBUSB_1_0=1.0.9
@@ -52,14 +52,14 @@ SF_MIRROR=switch.dl.sourceforge.net
 # We need to find tools in the toolchain and in the install directory.
 export PATH=$PREFIX/bin:$TOOLCHAIN/bin:$PATH
 
-# Tell pkg-config to only look for our cross-built stuff
+# Tell pkg-config to only look for our cross-built stuff.
 export PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig"
 export -n PKG_CONFIG_PATH
 
 # Define some helper variables.
 C="--host=arm-linux-androideabi --prefix=$PREFIX"
 
-# Remember the directory we're in
+# Remember the directory we're in.
 case "$0" in
   /*) TOP=$(dirname "$0");;
   *) TOP=$(dirname "$(pwd)"/"$0");;
@@ -163,7 +163,7 @@ cd libusb-$VER_LIBUSB
 cp -f ../config/config.guess .
 cp -f ../config/config.sub .
 ./configure $C
-# explicitly exclude libusbpp.la from lib_LTLIBRARIES, and skip subdirs
+# Explicitly exclude libusbpp.la from lib_LTLIBRARIES, and skip subdirs.
 make lib_LTLIBRARIES=libusb.la SUBDIRS=.
 make lib_LTLIBRARIES=libusb.la SUBDIRS=. install
 cd ..
@@ -193,7 +193,8 @@ cd ..
 git clone git://sigrok.org/libsigrok
 cd libsigrok
 ./autogen.sh
-LDFLAGS=-L$PREFIX/lib CPPFLAGS="-I$PREFIX/include -I$PREFIX/lib/libzip/include" ./configure $C --disable-alsa
+./configure $C
 make
 make install
 cd ..
+