From: Marcus Comstedt <redacted>
Date: Thu, 15 Aug 2013 16:02:19 +0000 (+0200)
Subject: sigrok-cross-android: Fix glib build
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=f0e760bb48f29a3a3e839a0b85882bbe622943b8;p=sigrok-util.git

sigrok-cross-android: Fix glib build
---

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 0dc8aa0..6dbda3b 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -124,15 +124,15 @@ 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 ..
+wget https://github.com/djdeath/glib/archive/android.zip
+unzip 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
+make
+make install
+cd ..
 
 # libzip
 wget http://www.nih.at/libzip/libzip-$VER_LIBZIP.tar.gz