diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-04-23 20:35:30 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-27 14:57:45 +0100 |
commit | c7478e328f6507350b7d2d2c790b3dd2bfe2d832 (patch) | |
tree | 67e84646a43c110d4658e0d6553506a81ad7b75d /meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch | |
parent | be5708b077dea2557df1226f7570c4757b68b46d (diff) | |
download | openembedded-core-contrib-c7478e328f6507350b7d2d2c790b3dd2bfe2d832.tar.gz |
pkgconfig: Upgrade to latest git tip
0.28 was released 2 years ago and bunch of patches
have gone in since. The commit rate is quite low
so its not a lot of churn to use. We have backports
for few bugs that are removed. Git version of recipe is removed too
since its no longer needed
Change-Id: I4b57db15320c76b1de5d26a733e60436663ff34a
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch')
-rw-r--r-- | meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch b/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch new file mode 100644 index 0000000000..9bee438a49 --- /dev/null +++ b/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch @@ -0,0 +1,45 @@ + +Upstream-Status: Inapropriate [embedded specific] + +Signed-off-by: Saul Wold <sgw@linux.intel.com> + + +Index: pkg-config-0.28/glib/configure.ac +=================================================================== +--- pkg-config-0.28.orig/glib/configure.ac ++++ pkg-config-0.28/glib/configure.ac +@@ -1438,7 +1438,7 @@ if test x"$glib_native_win32" = xyes; th + G_MODULE_LDFLAGS= + else + export SED +- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++ G_MODULE_LDFLAGS=`(./${host_alias}-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + fi + dnl G_MODULE_IMPL= don't reset, so cmd-line can override + G_MODULE_NEED_USCORE=0 +@@ -1503,13 +1503,13 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP + LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" + dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness + echo "void glib_plugin_test(void) { }" > plugin.c +- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ ++ ${SHELL} ./${host_alias}-libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ + ${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1 +- ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ ++ ${SHELL} ./${host_alias}-libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ + ${LDFLAGS} -module -o plugin.la -export-dynamic \ + -shrext ".o" -avoid-version plugin.lo \ + -rpath /dont/care >/dev/null 2>&1 +- eval `./libtool --config | grep ^objdir` ++ eval `./${host_alias}-libtool --config | grep ^objdir` + AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], + glib_cv_rtldglobal_broken,[ + AC_TRY_RUN([ +@@ -1582,7 +1582,7 @@ fi + + AC_MSG_CHECKING(for the suffix of module shared libraries) + export SED +-shrext_cmds=`./libtool --config | grep '^shrext_cmds='` ++shrext_cmds=`./${host_alias}-libtool --config | grep '^shrext_cmds='` + eval $shrext_cmds + module=yes eval std_shrext=$shrext_cmds + # chop the initial dot |