summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-01-27 15:28:34 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-30 11:37:02 +0000
commitfab76ae861c6d009a24a590fe2acd7bdcb8aa0a1 (patch)
tree778433c3f3e21fdceeb9f77be6b392e91b996331 /meta/recipes-core/glib-2.0
parent593dcd4a2211ee2fcb726df6abf41f060f4d28a3 (diff)
downloadpoky-fab76ae861c6d009a24a590fe2acd7bdcb8aa0a1.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 | ... (From OE-Core rev: c6f6f8b00c821de515b433ba598f231e0d8c65ca) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch22
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 1d69a3f290..aa5de27d12 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 @@
1From 1c5718648d49e795efee91c220a2bf9386c184f2 Mon Sep 17 00:00:00 2001 1From e8740833336c59d6f616a1781b256e648e338c26 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 28 Apr 2012 18:24:50 +0200 3Date: Sat, 28 Apr 2012 18:24:50 +0200
4Subject: [PATCH] configure: use $host_alias-libtool instead of libtool 4Subject: [PATCH] configure: use $host_alias-libtool instead of libtool
@@ -13,19 +13,20 @@ from PATH though
13 13
14Rebased to glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com> 14Rebased to glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com>
15Rebased to glib-2.32.1 by Martin Jansa <Martin.Jansa@gmail.com> 15Rebased to glib-2.32.1 by Martin Jansa <Martin.Jansa@gmail.com>
16Rebased to glib-2.31.20+ by Andre McCurdy <armccurdy@gmail.com>
16 17
17Upstream-Status: Inappropriate [configuration] 18Upstream-Status: Inappropriate [configuration]
18 19
19Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 20Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
20--- 21---
21 configure.ac | 8 ++++---- 22 configure.ac | 10 +++++-----
22 1 files changed, 4 insertions(+), 4 deletions(-) 23 1 file changed, 5 insertions(+), 5 deletions(-)
23 24
24diff --git a/configure.ac b/configure.ac 25diff --git a/configure.ac b/configure.ac
25index a6478c6..9a93d60 100644 26index 1af90c5..f6b7a73 100644
26--- a/configure.ac 27--- a/configure.ac
27+++ b/configure.ac 28+++ b/configure.ac
28@@ -1470,7 +1470,7 @@ if test x"$glib_native_win32" = xyes; then 29@@ -1378,7 +1378,7 @@ if test x"$glib_native_win32" = xyes; then
29 G_MODULE_LDFLAGS= 30 G_MODULE_LDFLAGS=
30 else 31 else
31 export SED 32 export SED
@@ -34,7 +35,7 @@ index a6478c6..9a93d60 100644
34 fi 35 fi
35 dnl G_MODULE_IMPL= don't reset, so cmd-line can override 36 dnl G_MODULE_IMPL= don't reset, so cmd-line can override
36 G_MODULE_NEED_USCORE=0 37 G_MODULE_NEED_USCORE=0
37@@ -1535,9 +1535,9 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then 38@@ -1427,13 +1427,13 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [
38 LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" 39 LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
39 dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness 40 dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
40 echo "void glib_plugin_test(void) { }" > plugin.c 41 echo "void glib_plugin_test(void) { }" > plugin.c
@@ -46,7 +47,12 @@ index a6478c6..9a93d60 100644
46 ${LDFLAGS} -module -o plugin.la -export-dynamic \ 47 ${LDFLAGS} -module -o plugin.la -export-dynamic \
47 -shrext ".o" -avoid-version plugin.lo \ 48 -shrext ".o" -avoid-version plugin.lo \
48 -rpath /dont/care >/dev/null 2>&1 49 -rpath /dont/care >/dev/null 2>&1
49@@ -1614,7 +1614,7 @@ fi 50- eval `./libtool --config | grep ^objdir`
51+ eval `./$host_alias-libtool --config | grep ^objdir`
52 AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
53 glib_cv_rtldglobal_broken,[
54 AC_TRY_RUN([
55@@ -1506,7 +1506,7 @@ fi
50 56
51 AC_MSG_CHECKING(for the suffix of module shared libraries) 57 AC_MSG_CHECKING(for the suffix of module shared libraries)
52 export SED 58 export SED
@@ -56,5 +62,5 @@ index a6478c6..9a93d60 100644
56 module=yes eval std_shrext=$shrext_cmds 62 module=yes eval std_shrext=$shrext_cmds
57 # chop the initial dot 63 # chop the initial dot
58-- 64--
591.7.8.6 651.9.1
60 66