diff options
| author |   Andre McCurdy <armccurdy@gmail.com> | 2016-01-27 15:28:34 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-29 18:14:55 +0000 |
| commit | c6f6f8b00c821de515b433ba598f231e0d8c65ca (patch) | |
| tree | 99413cc6ee808157fa2a0f253db9883cb20b805e /meta/recipes-core | |
| parent | 8b9b9fd700b19731b14a7dcc51d0fa013a5e106a (diff) | |
| download | openembedded-core-contrib-c6f6f8b00c821de515b433ba598f231e0d8c65ca.tar.gz | |
glib-2.0: refresh configure-libtool.patch
Refresh configure-libtool.patch to replace one more instance of
./libtool in configure.ac, first introduced in v2.31.20:
https://git.gnome.org/browse/glib/commit/?id=59ee6dbc004adda8c4e4c8ff58bf21a9173eb99f
Fixes "./libtool: No such file or directory" warnings when running
configure:
| ...
| checking for dlsym in -ldl... yes
| ../glib-2.46.2/configure: line 25481: ./libtool: No such file or directory
| checking for RTLD_GLOBAL brokenness... (cached) yes
| ...
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch index 1d69a3f2908..aa5de27d125 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch @@ -1,4 +1,4 @@ -From 1c5718648d49e795efee91c220a2bf9386c184f2 Mon Sep 17 00:00:00 2001 +From e8740833336c59d6f616a1781b256e648e338c26 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 28 Apr 2012 18:24:50 +0200 Subject: [PATCH] configure: use $host_alias-libtool instead of libtool @@ -13,19 +13,20 @@ from PATH though Rebased to glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com> Rebased to glib-2.32.1 by Martin Jansa <Martin.Jansa@gmail.com> +Rebased to glib-2.31.20+ by Andre McCurdy <armccurdy@gmail.com> Upstream-Status: Inappropriate [configuration] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- - configure.ac | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + configure.ac | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index a6478c6..9a93d60 100644 +index 1af90c5..f6b7a73 100644 --- a/configure.ac +++ b/configure.ac -@@ -1470,7 +1470,7 @@ if test x"$glib_native_win32" = xyes; then +@@ -1378,7 +1378,7 @@ if test x"$glib_native_win32" = xyes; then G_MODULE_LDFLAGS= else export SED @@ -34,7 +35,7 @@ index a6478c6..9a93d60 100644 fi dnl G_MODULE_IMPL= don't reset, so cmd-line can override G_MODULE_NEED_USCORE=0 -@@ -1535,9 +1535,9 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then +@@ -1427,13 +1427,13 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [ LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness echo "void glib_plugin_test(void) { }" > plugin.c @@ -46,7 +47,12 @@ index a6478c6..9a93d60 100644 ${LDFLAGS} -module -o plugin.la -export-dynamic \ -shrext ".o" -avoid-version plugin.lo \ -rpath /dont/care >/dev/null 2>&1 -@@ -1614,7 +1614,7 @@ fi +- 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([ +@@ -1506,7 +1506,7 @@ fi AC_MSG_CHECKING(for the suffix of module shared libraries) export SED @@ -56,5 +62,5 @@ index a6478c6..9a93d60 100644 module=yes eval std_shrext=$shrext_cmds # chop the initial dot -- -1.7.8.6 +1.9.1 |