From: Martin Ling <redacted>
Date: Wed, 4 Dec 2013 18:11:14 +0000 (+0000)
Subject: Use latest glib.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=96a10f86b44eb68588900c7f64b2ecbb62d7cfaf;p=sigrok-util.git

Use latest glib.
---

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 2dcfc29..d6a27ed 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -135,12 +135,12 @@ make install
 cd ..
 
 # glib
-wget https://github.com/djdeath/glib/archive/android.zip
-unzip -q android.zip
-cd glib-android
+wget http://ftp.gnome.org/pub/gnome/sources/glib/2.38/glib-2.38.2.tar.xz
+tar xJf glib-2.38.2.tar.xz
+cd glib-2.38.2
 ./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
+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
 make
 make install
 cd ..