blob: 59b891347da8c5f6785e25ba1ee2acb72b33f8d0 [file] [log] [blame]
Brad Bishop316dfdd2018-06-25 12:45:53 -04001From 1dd1e6ddca5deada049bac2e1ee1fe4ecc5342c5 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
Brad Bishop316dfdd2018-06-25 12:45:53 -04004Subject: [PATCH 01/10] configure: use $host_alias-libtool instead of libtool
Patrick Williamsc124f4f2015-09-15 14:41:29 -05005 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>
Brad Bishop316dfdd2018-06-25 12:45:53 -040021
Patrick Williamsc124f4f2015-09-15 14:41:29 -050022---
Brad Bishop316dfdd2018-06-25 12:45:53 -040023 configure.ac | 4 ++--
24 1 file changed, 2 insertions(+), 2 deletions(-)
Patrick Williamsc124f4f2015-09-15 14:41:29 -050025
26diff --git a/configure.ac b/configure.ac
Brad Bishop316dfdd2018-06-25 12:45:53 -040027index 6fa6eb0..b6f78a6 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -050028--- a/configure.ac
29+++ b/configure.ac
Brad Bishop316dfdd2018-06-25 12:45:53 -040030@@ -1428,9 +1428,9 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [
Patrick Williamsc124f4f2015-09-15 14:41:29 -050031 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 Williamsc124f4f2015-09-15 14:41:29 -050042--
Brad Bishop316dfdd2018-06-25 12:45:53 -0400432.14.1
Patrick Williamsc124f4f2015-09-15 14:41:29 -050044