diff options
| author | Peter Foley <pefoley2@pefoley.com> | 2016-01-18 16:28:54 -0500 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-01-22 06:38:13 +0000 |
| commit | af2548f0003acba63204d2bc752aebb1a2f45ec3 (patch) | |
| tree | 165fab174a7750f4d09c0f49cc62af5da82c82a9 | |
| parent | 1c1b788f38da07aed268be3c515a096594a107dc (diff) | |
Don't pollute cross-compilation environment with host pkg-config
Revised to prevent undefined macro errors with older pkg-config.
Change-Id: Ia588525e5537d7cf758b5351c0a4c5f48b28a200
Reviewed-on: https://gerrit.libreoffice.org/21595
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 0f9fa82a5585..75d6b7071550 100644 --- a/configure.ac +++ b/configure.ac @@ -490,6 +490,7 @@ if test -n "$with_android_ndk"; then ANDROIDCFLAGS="$ANDROIDCFLAGS -ffunction-sections -fdata-sections" ANDROIDCFLAGS="$ANDROIDCFLAGS -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}libs/$ANDROID_APP_ABI" ANDROIDCFLAGS="$ANDROIDCFLAGS --sysroot=$ANDROID_NDK_HOME/platforms/android-${ANDROID_API_LEVEL}/arch-${ANDROID_ARCH}" + export PKG_CONFIG_LIBDIR="$ANDROID_BINUTILS_PREBUILT_ROOT/lib/pkgconfig" if test -n "$ANDROID_USING_CLANG"; then ANDROIDCFLAGS="$ANDROIDCFLAGS -Qunused-arguments" @@ -4592,6 +4593,7 @@ dnl machine when doing cross-compilation dnl =================================================================== m4_pattern_allow([PKG_CONFIG_FOR_BUILD]) +m4_pattern_allow([PKG_CONFIG_LIBDIR]) if test "$cross_compiling" = "yes"; then AC_MSG_CHECKING([for BUILD platform configuration]) echo @@ -4621,7 +4623,7 @@ if test "$cross_compiling" = "yes"; then unset CC CXX SYSBASE CFLAGS unset AR NM OBJDUMP PKG_CONFIG RANLIB READELF STRIP unset CPPUNIT_CFLAGS CPPUNIT_LIBS - unset LIBXML_CFLAGS LIBXML_LIBS LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC + unset LIBXML_CFLAGS LIBXML_LIBS LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC PKG_CONFIG_LIBDIR test -n "$CC_FOR_BUILD" && export CC="$CC_FOR_BUILD" test -n "$CXX_FOR_BUILD" && export CXX="$CXX_FOR_BUILD" test -n "$PKG_CONFIG_FOR_BUILD" && export PKG_CONFIG="$PKG_CONFIG_FOR_BUILD" |