diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
commit | 972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch) | |
tree | 97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch | |
download | poky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
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 | 60 |
1 files changed, 60 insertions, 0 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 new file mode 100644 index 0000000000..1d69a3f290 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | From 1c5718648d49e795efee91c220a2bf9386c184f2 Mon Sep 17 00:00:00 2001 | ||
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> | ||
16 | |||
17 | Upstream-Status: Inappropriate [configuration] | ||
18 | |||
19 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
20 | --- | ||
21 | configure.ac | 8 ++++---- | ||
22 | 1 files changed, 4 insertions(+), 4 deletions(-) | ||
23 | |||
24 | diff --git a/configure.ac b/configure.ac | ||
25 | index a6478c6..9a93d60 100644 | ||
26 | --- a/configure.ac | ||
27 | +++ b/configure.ac | ||
28 | @@ -1470,7 +1470,7 @@ if test x"$glib_native_win32" = xyes; then | ||
29 | G_MODULE_LDFLAGS= | ||
30 | else | ||
31 | export SED | ||
32 | - G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
33 | + G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
34 | fi | ||
35 | dnl G_MODULE_IMPL= don't reset, so cmd-line can override | ||
36 | G_MODULE_NEED_USCORE=0 | ||
37 | @@ -1535,9 +1535,9 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then | ||
38 | LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" | ||
39 | dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness | ||
40 | echo "void glib_plugin_test(void) { }" > plugin.c | ||
41 | - ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ | ||
42 | + ${SHELL} ./$host_alias-libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ | ||
43 | ${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1 | ||
44 | - ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ | ||
45 | + ${SHELL} ./$host_alias-libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ | ||
46 | ${LDFLAGS} -module -o plugin.la -export-dynamic \ | ||
47 | -shrext ".o" -avoid-version plugin.lo \ | ||
48 | -rpath /dont/care >/dev/null 2>&1 | ||
49 | @@ -1614,7 +1614,7 @@ fi | ||
50 | |||
51 | AC_MSG_CHECKING(for the suffix of module shared libraries) | ||
52 | export SED | ||
53 | -shrext_cmds=`./libtool --config | grep '^shrext_cmds='` | ||
54 | +shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='` | ||
55 | eval $shrext_cmds | ||
56 | module=yes eval std_shrext=$shrext_cmds | ||
57 | # chop the initial dot | ||
58 | -- | ||
59 | 1.7.8.6 | ||
60 | |||