summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-02-20 21:10:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-25 12:35:59 +0000
commita3ebd8a19de79c0dbd83a8430acfcffadbda48e7 (patch)
tree4cffcb52e5f62c8685938e8d2d8428bb23c04856 /meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
parentce0d8dbbf01960a13e5883fa036acef346c56c85 (diff)
downloadpoky-a3ebd8a19de79c0dbd83a8430acfcffadbda48e7.tar.gz
glib-2.0: convert from autotools to meson
PRINTF settings no longer seem necessary (tested with mingw). Add meson-specific bits to Enable-more-tests-while-cross-compiling.patch and 0001-Install-gio-querymodules-as-libexec_PROGRAM.patch Add 0001-Set-host_machine-correctly-when-building-with-mingw3.patch to allow 'mingw32' as target machine in addition to 'windows'. Add 0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch to correct ARM build errors. Drop configure-libtool.patch (autotools-specific). Fix API docs generation (From OE-Core rev: e185235dd97510bfdc621cef9c18d8d13b16006d) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch44
1 files changed, 0 insertions, 44 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
deleted file mode 100644
index 59b891347d..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 1dd1e6ddca5deada049bac2e1ee1fe4ecc5342c5 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 28 Apr 2012 18:24:50 +0200
4Subject: [PATCH 01/10] configure: use $host_alias-libtool instead of libtool
5 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>
16Rebased to glib-2.31.20+ by Andre McCurdy <armccurdy@gmail.com>
17
18Upstream-Status: Inappropriate [configuration]
19
20Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
21
22---
23 configure.ac | 4 ++--
24 1 file changed, 2 insertions(+), 2 deletions(-)
25
26diff --git a/configure.ac b/configure.ac
27index 6fa6eb0..b6f78a6 100644
28--- a/configure.ac
29+++ b/configure.ac
30@@ -1428,9 +1428,9 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [
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
42--
432.14.1
44