mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-20 03:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

glib-2.0: refresh configure-libtool.patch

Browse Source 
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>
This commit is contained in:
Andre McCurdy
2016-01-27 15:28:34 -08:00
committed by Richard Purdie
parent 593dcd4a22
commit fab76ae861
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
View File

@@ -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> From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 28 Apr 2012 18:24:50 +0200 Date: Sat, 28 Apr 2012 18:24:50 +0200
Subject: [PATCH] configure: use $host_alias-libtool instead of libtool 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.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.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] Upstream-Status: Inappropriate [configuration]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
--- ---
configure.ac | 8 ++++---- configure.ac | 10 +++++-----
1 files changed, 4 insertions(+), 4 deletions(-) 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index a6478c6..9a93d60 100644 index 1af90c5..f6b7a73 100644
--- a/configure.ac --- a/configure.ac
+++ b/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= G_MODULE_LDFLAGS=
else else
export SED export SED
@@ -34,7 +35,7 @@ index a6478c6..9a93d60 100644
fi fi
dnl G_MODULE_IMPL= don't reset, so cmd-line can override dnl G_MODULE_IMPL= don't reset, so cmd-line can override
G_MODULE_NEED_USCORE=0 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" LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
echo "void glib_plugin_test(void) { }" > plugin.c echo "void glib_plugin_test(void) { }" > plugin.c
@@ -46,7 +47,12 @@ index a6478c6..9a93d60 100644
${LDFLAGS} -module -o plugin.la -export-dynamic \ ${LDFLAGS} -module -o plugin.la -export-dynamic \
-shrext ".o" -avoid-version plugin.lo \ -shrext ".o" -avoid-version plugin.lo \
-rpath /dont/care >/dev/null 2>&1 -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) AC_MSG_CHECKING(for the suffix of module shared libraries)
export SED export SED
@@ -56,5 +62,5 @@ index a6478c6..9a93d60 100644
module=yes eval std_shrext=$shrext_cmds module=yes eval std_shrext=$shrext_cmds
# chop the initial dot # chop the initial dot
-- --
1.7.8.6 1.9.1