blob: aa5de27d125c5624ce10dfb54d4121b3baf0c00c [file] [log] [blame]
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05001From e8740833336c59d6f616a1781b256e648e338c26 Mon Sep 17 00:00:00 2001
Patrick Williamsc124f4f2015-09-15 14:41:29 -05002From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 28 Apr 2012 18:24:50 +0200
4Subject: [PATCH] configure: use $host_alias-libtool instead of libtool
5 directly
6
7Poky renames libtool to $host_alias-libtool.
8./$host_alias-libtool isn't created until after configure runs with
9libtool >= 2.2.2
10so we can't call # it at this point. We can safely assume a version is
11available
12from PATH though
13
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>
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050016Rebased to glib-2.31.20+ by Andre McCurdy <armccurdy@gmail.com>
Patrick Williamsc124f4f2015-09-15 14:41:29 -050017
18Upstream-Status: Inappropriate [configuration]
19
20Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
21---
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050022 configure.ac | 10 +++++-----
23 1 file changed, 5 insertions(+), 5 deletions(-)
Patrick Williamsc124f4f2015-09-15 14:41:29 -050024
25diff --git a/configure.ac b/configure.ac
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050026index 1af90c5..f6b7a73 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -050027--- a/configure.ac
28+++ b/configure.ac
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050029@@ -1378,7 +1378,7 @@ if test x"$glib_native_win32" = xyes; then
Patrick Williamsc124f4f2015-09-15 14:41:29 -050030 G_MODULE_LDFLAGS=
31 else
32 export SED
33- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
34+ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
35 fi
36 dnl G_MODULE_IMPL= don't reset, so cmd-line can override
37 G_MODULE_NEED_USCORE=0
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050038@@ -1427,13 +1427,13 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [
Patrick Williamsc124f4f2015-09-15 14:41:29 -050039 LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
40 dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
41 echo "void glib_plugin_test(void) { }" > plugin.c
42- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
43+ ${SHELL} ./$host_alias-libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
44 ${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1
45- ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
46+ ${SHELL} ./$host_alias-libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
47 ${LDFLAGS} -module -o plugin.la -export-dynamic \
48 -shrext ".o" -avoid-version plugin.lo \
49 -rpath /dont/care >/dev/null 2>&1
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050050- 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
Patrick Williamsc124f4f2015-09-15 14:41:29 -050056
57 AC_MSG_CHECKING(for the suffix of module shared libraries)
58 export SED
59-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
60+shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='`
61 eval $shrext_cmds
62 module=yes eval std_shrext=$shrext_cmds
63 # chop the initial dot
64--
Patrick Williamsd8c66bc2016-06-20 12:57:21 -0500651.9.1
Patrick Williamsc124f4f2015-09-15 14:41:29 -050066