Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 1 | From 1dd1e6ddca5deada049bac2e1ee1fe4ecc5342c5 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 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 4 | Subject: [PATCH 01/10] configure: use $host_alias-libtool instead of libtool |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 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> |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 21 | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 22 | --- |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 23 | configure.ac | 4 ++-- |
| 24 | 1 file changed, 2 insertions(+), 2 deletions(-) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 25 | |
| 26 | diff --git a/configure.ac b/configure.ac |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 27 | index 6fa6eb0..b6f78a6 100644 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 28 | --- a/configure.ac |
| 29 | +++ b/configure.ac |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 30 | @@ -1428,9 +1428,9 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 31 | LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" |
| 32 | dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness |
| 33 | echo "void glib_plugin_test(void) { }" > plugin.c |
| 34 | - ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ |
| 35 | + ${SHELL} ./$host_alias-libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ |
| 36 | ${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1 |
| 37 | - ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ |
| 38 | + ${SHELL} ./$host_alias-libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ |
| 39 | ${LDFLAGS} -module -o plugin.la -export-dynamic \ |
| 40 | -shrext ".o" -avoid-version plugin.lo \ |
| 41 | -rpath /dont/care >/dev/null 2>&1 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 42 | -- |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 43 | 2.14.1 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 44 | |