sigrok-cross-android: Prevent glib from running configure with wrong args
authorMarcus Comstedt <marcus@mc.pp.se>
Sun, 2 Nov 2014 22:46:44 +0000 (23:46 +0100)
committerMarcus Comstedt <marcus@mc.pp.se>
Sun, 2 Nov 2014 23:06:10 +0000 (00:06 +0100)
The autogen.sh script in glib will run the generated configure script
(for a non-cross build) unless the environment variable NOCONFIGURE is
set.  Set it.

cross-compile/android/sigrok-cross-android

index 57ab3d1f1115cc026c836a806accdb9fcfcfadc1..ce3d0af2bbda070bd9eeb386d46e68d0a6fa755a 100755 (executable)
@@ -242,7 +242,7 @@ cd ..
 $WGET http://ftp.gnome.org/pub/gnome/sources/glib/$VER_GLIB_SHORT/glib-$VER_GLIB.tar.xz
 tar xfJ glib-$VER_GLIB.tar.xz
 cd glib-$VER_GLIB
-./autogen.sh
+NOCONFIGURE=yes ./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 --disable-compile-warnings $C
 make $PARALLEL