X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=72da7c8ae3dc14a16b5fea38573f37591f2e5505;hb=559be0ff71b4972999f869e04f9b26ab9911328b;hp=6dbda3b757f5ed6a263764aa43b5e559f0d1122d;hpb=f0e760bb48f29a3a3e839a0b85882bbe622943b8;p=sigrok-util.git

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 6dbda3b..72da7c8 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -124,12 +124,13 @@ make
 make install
 cd ..
 
-## # glib
+# glib
 wget https://github.com/djdeath/glib/archive/android.zip
-unzip android.zip
+unzip -q android.zip
 cd glib-android
 ./autogen.sh
-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
+# Note: Manual LDFLAGS/CPPFLAGS needed for libiconv, rest uses pkg-config.
+PKG_CONFIG_PATH=$P 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
 cd ..
@@ -168,3 +169,11 @@ 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
+make
+make install
+cd ..