Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From e8740833336c59d6f616a1781b256e648e338c26 Mon Sep 17 00:00:00 2001 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
| 3 | Date: Sat, 28 Apr 2012 18:24:50 +0200 |
| 4 | Subject: [PATCH] configure: use $host_alias-libtool instead of libtool |
| 5 | directly |
| 6 | |
| 7 | Poky renames libtool to $host_alias-libtool. |
| 8 | ./$host_alias-libtool isn't created until after configure runs with |
| 9 | libtool >= 2.2.2 |
| 10 | so we can't call # it at this point. We can safely assume a version is |
| 11 | available |
| 12 | from PATH though |
| 13 | |
| 14 | Rebased to glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com> |
| 15 | Rebased to glib-2.32.1 by Martin Jansa <Martin.Jansa@gmail.com> |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 16 | Rebased to glib-2.31.20+ by Andre McCurdy <armccurdy@gmail.com> |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 17 | |
| 18 | Upstream-Status: Inappropriate [configuration] |
| 19 | |
| 20 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 21 | --- |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 22 | configure.ac | 10 +++++----- |
| 23 | 1 file changed, 5 insertions(+), 5 deletions(-) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 24 | |
| 25 | diff --git a/configure.ac b/configure.ac |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 26 | index 1af90c5..f6b7a73 100644 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 27 | --- a/configure.ac |
| 28 | +++ b/configure.ac |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 29 | @@ -1378,7 +1378,7 @@ if test x"$glib_native_win32" = xyes; then |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 30 | 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 Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 38 | @@ -1427,13 +1427,13 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 39 | 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 Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 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 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 56 | |
| 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 Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 65 | 1.9.1 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 66 | |