X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=fdc210fc193bfed721960d1f5acbf57529cbc4a9;hb=5036134a27b64721506510ef985bc57915066f3e;hp=d314b2033d36083072930fc228fd98b163c009c9;hpb=589df790c81983c80b342f2004b9a73c67db6e97;p=sigrok-util.git

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index d314b20..fdc210f 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -35,14 +35,15 @@ 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
 
 SF_MIRROR=switch.dl.sourceforge.net
 
@@ -51,9 +52,18 @@ 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
+export PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig"
+export -n PKG_CONFIG_PATH
+
 # Define some helper variables.
 C="--host=arm-linux-androideabi --prefix=$PREFIX"
-P="$PREFIX/lib/pkgconfig"
+
+# Remember the directory we're in
+case "$0" in
+  /*) TOP=$(dirname "$0");;
+  *) TOP=$(dirname "$(pwd)"/"$0");;
+esac
 
 # Remove build directory contents (if any) and create a new build dir.
 rm -rf $BUILDDIR
@@ -124,11 +134,12 @@ make
 make install
 cd ..
 
-## # glib
+# glib
 wget https://github.com/djdeath/glib/archive/android.zip
 unzip -q android.zip
 cd glib-android
 ./autogen.sh
+# Note: Manual LDFLAGS/CPPFLAGS needed for libiconv, rest uses pkg-config.
 LDFLAGS=-L$PREFIX/lib CPPFLAGS=-I$PREFIX/include glib_cv_stack_grows=no glib_cv_uscore=no ac_cv_func_posix_getpwuid_r=no ac_cv_func_posix_getgrgid_r=no ./configure $C --disable-modular-tests
 make
 make install
@@ -168,11 +179,21 @@ make
 make install
 cd ..
 
+# libusb-1.0
+wget http://$SF_MIRROR/project/libusb/libusb-1.0/libusb-$VER_LIBUSB_1_0/libusb-$VER_LIBUSB_1_0.tar.bz2
+tar xfj libusb-$VER_LIBUSB_1_0.tar.bz2
+cd libusb-$VER_LIBUSB_1_0
+patch -p1 < $TOP/libusb-1.0.patch
+./configure $C
+make
+make install
+cd ..
+
 # libsigrok
 git clone git://sigrok.org/libsigrok
 cd libsigrok
 ./autogen.sh
-LDFLAGS=-L$PREFIX/lib CPPFLAGS="-I$PREFIX/include -I$PREFIX/lib/libzip/include" PKG_CONFIG_LIBDIR=$PREFIX/lib/pkgconfig ./configure $C --disable-alsa --disable-link-mso19 --disable-kecheng-kc-330b
+LDFLAGS=-L$PREFIX/lib CPPFLAGS="-I$PREFIX/include -I$PREFIX/lib/libzip/include" ./configure $C --disable-alsa
 make
 make install
 cd ..