sigrok-cross-android: Set PKG_CONFIG_LIBDIR globally

[sigrok-util.git] / cross-compile / android / sigrok-cross-android

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 0dc8aa0e789cdd8fea2cdd2d9c3140a998264f32..96224755e0b147b75c13aed2fca73ef8985ebeca 100755 (executable)
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -51,9 +51,12 @@ 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"
 
 # Remove build directory contents (if any) and create a new build dir.
 rm -rf $BUILDDIR
@@ -124,15 +127,16 @@ make
 make install
 cd ..
 
-## # TODO: Not all build-dependencies build, yet.
-## # glib
-## wget ftp://ftp.gnome.org/pub/gnome/sources/glib/2.34/glib-$VER_GLIB.tar.xz
-## tar xfJ glib-$VER_GLIB.tar.xz
-## cd glib-$VER_GLIB
-## ./configure $C
-## make
-## make install
-## cd ..
+# 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
+cd ..
 
 # libzip
 wget http://www.nih.at/libzip/libzip-$VER_LIBZIP.tar.gz
@@ -168,3 +172,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" ./configure $C --disable-alsa --disable-link-mso19 --disable-kecheng-kc-330b
+make
+make install
+cd ..