From: Uwe Hermann <redacted>
Date: Fri, 16 Aug 2013 10:11:37 +0000 (+0200)
Subject: sigrok-cross-android: Add PKG_CONFIG_PATH for glib.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=559be0ff71b4972999f869e04f9b26ab9911328b;p=sigrok-util.git

sigrok-cross-android: Add PKG_CONFIG_PATH for glib.

Among other things, this fixes the build wrt ffi.h not being found.

  CC       libgobject_2_0_la-gclosure.lo
gclosure.c:29:17: fatal error: ffi.h: No such file or directory
---

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index d314b20..72da7c8 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -124,12 +124,13 @@ make
 make install
 cd ..
 
-## # glib
+# glib
 wget https://github.com/djdeath/glib/archive/android.zip
 unzip -q 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
+# Note: Manual LDFLAGS/CPPFLAGS needed for libiconv, rest uses pkg-config.
+PKG_CONFIG_PATH=$P 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 ..