diff options
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch index aa5de27d12..59b891347d 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From e8740833336c59d6f616a1781b256e648e338c26 Mon Sep 17 00:00:00 2001 | 1 | From 1dd1e6ddca5deada049bac2e1ee1fe4ecc5342c5 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 28 Apr 2012 18:24:50 +0200 | 3 | Date: Sat, 28 Apr 2012 18:24:50 +0200 |
4 | Subject: [PATCH] configure: use $host_alias-libtool instead of libtool | 4 | Subject: [PATCH 01/10] configure: use $host_alias-libtool instead of libtool |
5 | directly | 5 | directly |
6 | 6 | ||
7 | Poky renames libtool to $host_alias-libtool. | 7 | Poky renames libtool to $host_alias-libtool. |
@@ -18,24 +18,16 @@ Rebased to glib-2.31.20+ by Andre McCurdy <armccurdy@gmail.com> | |||
18 | Upstream-Status: Inappropriate [configuration] | 18 | Upstream-Status: Inappropriate [configuration] |
19 | 19 | ||
20 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 20 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
21 | |||
21 | --- | 22 | --- |
22 | configure.ac | 10 +++++----- | 23 | configure.ac | 4 ++-- |
23 | 1 file changed, 5 insertions(+), 5 deletions(-) | 24 | 1 file changed, 2 insertions(+), 2 deletions(-) |
24 | 25 | ||
25 | diff --git a/configure.ac b/configure.ac | 26 | diff --git a/configure.ac b/configure.ac |
26 | index 1af90c5..f6b7a73 100644 | 27 | index 6fa6eb0..b6f78a6 100644 |
27 | --- a/configure.ac | 28 | --- a/configure.ac |
28 | +++ b/configure.ac | 29 | +++ b/configure.ac |
29 | @@ -1378,7 +1378,7 @@ if test x"$glib_native_win32" = xyes; then | 30 | @@ -1428,9 +1428,9 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [ |
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 | ||
38 | @@ -1427,13 +1427,13 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [ | ||
39 | LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" | 31 | LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" |
40 | dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness | 32 | dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness |
41 | echo "void glib_plugin_test(void) { }" > plugin.c | 33 | echo "void glib_plugin_test(void) { }" > plugin.c |
@@ -47,20 +39,6 @@ index 1af90c5..f6b7a73 100644 | |||
47 | ${LDFLAGS} -module -o plugin.la -export-dynamic \ | 39 | ${LDFLAGS} -module -o plugin.la -export-dynamic \ |
48 | -shrext ".o" -avoid-version plugin.lo \ | 40 | -shrext ".o" -avoid-version plugin.lo \ |
49 | -rpath /dont/care >/dev/null 2>&1 | 41 | -rpath /dont/care >/dev/null 2>&1 |
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 | ||
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 | -- | 42 | -- |
65 | 1.9.1 | 43 | 2.14.1 |
66 | 44 | ||