summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Soliverez <alvaro.soliverez@collabora.co.uk>2012-03-23 14:47:42 -0300
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-08-06 17:34:43 +0100
commit132074524eb5c4a4c374bae6c8f91141807a791e (patch)
tree00535c7a1ee438ee30abd921559e6fe2dfe1da69
parent6a09b1ea1dbc7644aa9cfa25a9a8bfbcdfe29246 (diff)
On Android, use pkg-config --static
This makes it output the complete dependency chain for each library, e.g. libffi for GObject. This is necessary because Android toolchains don't follow shared library interdependencies like normal GNU toolchains. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=47940 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
-rw-r--r--Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index d6dff63..bc6aa00 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,6 +14,7 @@ ytstenut-glib-configure-real:
LDFLAGS="$(CONFIGURE_LDFLAGS)" \
CPP=$(CONFIGURE_CPP) \
CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \
+ PKG_CONFIG="pkg-config --static" \
PKG_CONFIG_LIBDIR=$(CONFIGURE_PKG_CONFIG_LIBDIR) \
PKG_CONFIG_TOP_BUILD_DIR=$(PKG_CONFIG_TOP_BUILD_DIR) \
$(YTSTENUT_GLIB_TOP)/$(CONFIGURE) --host=arm-linux-androideabi \