]> sigrok.org Git - sigrok-util.git/commitdiff
Use latest glib.
authorMartin Ling <redacted>
Wed, 4 Dec 2013 18:11:14 +0000 (18:11 +0000)
committerUwe Hermann <redacted>
Sat, 7 Dec 2013 11:29:43 +0000 (12:29 +0100)
cross-compile/android/sigrok-cross-android

index 2dcfc29ad181c06139f6632ee0a78c50c9b9e8a6..d6a27ede4cf68700463735f6751f0f308b220e6c 100755 (executable)
@@ -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 ..