summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/fix-glib-configure-libtool-usage.patch
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-05-12 23:58:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-16 00:09:47 +0300
commitc50b1fb4754f213c79c7d0862eb275fa67fc27b6 (patch)
tree9b547c0c58134094453fe365569007bc4ad39d6e /meta/recipes-devtools/pkgconfig/pkgconfig-0.28/fix-glib-configure-libtool-usage.patch
parentf5b103ff47d6137326618328fa5803f0963e50f4 (diff)
downloadpoky-c50b1fb4754f213c79c7d0862eb275fa67fc27b6.tar.gz
pkgconfig: Update to 0.28
Remove older patches that have been fixed upstream, added new patch to use the correct alias-libtool instead of ./libtool. pkgconfig provides an internal glib library, so use it to avoid ciruclar dependecny issues. (From OE-Core rev: d91a43228c5ba35335a28de278194df23dcdf978) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/pkgconfig/pkgconfig-0.28/fix-glib-configure-libtool-usage.patch')
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig-0.28/fix-glib-configure-libtool-usage.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/fix-glib-configure-libtool-usage.patch b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/fix-glib-configure-libtool-usage.patch
new file mode 100644
index 0000000000..9bee438a49
--- /dev/null
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig-0.28/fix-glib-configure-libtool-usage.patch
@@ -0,0 +1,45 @@
1
2Upstream-Status: Inapropriate [embedded specific]
3
4Signed-off-by: Saul Wold <sgw@linux.intel.com>
5
6
7Index: pkg-config-0.28/glib/configure.ac
8===================================================================
9--- pkg-config-0.28.orig/glib/configure.ac
10+++ pkg-config-0.28/glib/configure.ac
11@@ -1438,7 +1438,7 @@ if test x"$glib_native_win32" = xyes; th
12 G_MODULE_LDFLAGS=
13 else
14 export SED
15- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
16+ G_MODULE_LDFLAGS=`(./${host_alias}-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
17 fi
18 dnl G_MODULE_IMPL= don't reset, so cmd-line can override
19 G_MODULE_NEED_USCORE=0
20@@ -1503,13 +1503,13 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
21 LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
22 dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
23 echo "void glib_plugin_test(void) { }" > plugin.c
24- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
25+ ${SHELL} ./${host_alias}-libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
26 ${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1
27- ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
28+ ${SHELL} ./${host_alias}-libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
29 ${LDFLAGS} -module -o plugin.la -export-dynamic \
30 -shrext ".o" -avoid-version plugin.lo \
31 -rpath /dont/care >/dev/null 2>&1
32- eval `./libtool --config | grep ^objdir`
33+ eval `./${host_alias}-libtool --config | grep ^objdir`
34 AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
35 glib_cv_rtldglobal_broken,[
36 AC_TRY_RUN([
37@@ -1582,7 +1582,7 @@ fi
38
39 AC_MSG_CHECKING(for the suffix of module shared libraries)
40 export SED
41-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
42+shrext_cmds=`./${host_alias}-libtool --config | grep '^shrext_cmds='`
43 eval $shrext_cmds
44 module=yes eval std_shrext=$shrext_cmds
45 # chop the initial dot