francis.wang
4c86c082a2
Combine poky (Yocto scarthgap), meta-openembedded (scarthgap), and meta-openwrt into a single repository. Components: - poky/ Yocto core framework (BitBake + OE-Core) - meta-openembedded/ Community layers (meta-oe, meta-python, meta-networking) - meta-openwrt/ OpenWrt customization layer - setup-env.sh One-click build environment setup - README.md Project documentation
34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
Fix glib cross compile
|
|
|
|
Uses proper PKG_CONFIG_PATH when cross-compiling
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-of-by: Aws Ismail <aws.ismail@windriver.com>
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index b5f5aad..f5a5b74 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -110,13 +110,13 @@ else
|
|
*** GLIB is always available from ftp://ftp.gtk.org/.])
|
|
fi
|
|
|
|
-exact_version=`pkg-config --modversion $GLIB`;
|
|
-GLIB_CFLAGS=`pkg-config --cflags $GLIB $GTHREAD`
|
|
-GLIB_LIBS=`pkg-config --libs $GLIB $GTHREAD`
|
|
-GLIB_ONLY_CFLAGS=`pkg-config --cflags $GLIB`
|
|
-GLIB_ONLY_LIBS=`pkg-config --libs $GLIB`
|
|
-GMODULE_ONLY_CFLAGS=`pkg-config --cflags $GMODULE`
|
|
-GMODULE_ONLY_LIBS=`pkg-config --libs $GMODULE`
|
|
+exact_version=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --modversion $GLIB`;
|
|
+GLIB_CFLAGS=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --cflags $GLIB $GTHREAD`
|
|
+GLIB_LIBS=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --libs $GLIB $GTHREAD`
|
|
+GLIB_ONLY_CFLAGS=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --cflags $GLIB`
|
|
+GLIB_ONLY_LIBS=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --libs $GLIB`
|
|
+GMODULE_ONLY_CFLAGS=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --cflags $GMODULE`
|
|
+GMODULE_ONLY_LIBS=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --libs $GMODULE`
|
|
|
|
# On some versions of Solaris the pkg-config file for gthread-2.0 contains a
|
|
# compiler option, '-mt', that is incompatible with gcc
|