diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-02-20 21:10:26 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 12:35:59 +0000 |
commit | a3ebd8a19de79c0dbd83a8430acfcffadbda48e7 (patch) | |
tree | 4cffcb52e5f62c8685938e8d2d8428bb23c04856 /meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch | |
parent | ce0d8dbbf01960a13e5883fa036acef346c56c85 (diff) | |
download | poky-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/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch index 97d0aff5d6..f246254942 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 856045927b9ab391165c0ebabf401835f8439eab Mon Sep 17 00:00:00 2001 | 1 | From 17fc9230fb932432d8faaaabf8c56fdc4845495e Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
3 | Date: Tue, 22 Mar 2016 15:14:58 +0200 | 3 | Date: Tue, 22 Mar 2016 15:14:58 +0200 |
4 | Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM | 4 | Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM |
@@ -11,7 +11,8 @@ Upstream-Status: Inappropriate [OE specific] | |||
11 | 11 | ||
12 | --- | 12 | --- |
13 | gio/Makefile.am | 3 ++- | 13 | gio/Makefile.am | 3 ++- |
14 | 1 file changed, 2 insertions(+), 1 deletion(-) | 14 | gio/meson.build | 1 + |
15 | 2 files changed, 3 insertions(+), 1 deletion(-) | ||
15 | 16 | ||
16 | diff --git a/gio/Makefile.am b/gio/Makefile.am | 17 | diff --git a/gio/Makefile.am b/gio/Makefile.am |
17 | index e14cad2..bf2bcc7 100644 | 18 | index e14cad2..bf2bcc7 100644 |
@@ -27,3 +28,15 @@ index e14cad2..bf2bcc7 100644 | |||
27 | 28 | ||
28 | glib_compile_resources_LDADD = libgio-2.0.la \ | 29 | glib_compile_resources_LDADD = libgio-2.0.la \ |
29 | $(top_builddir)/gobject/libgobject-2.0.la \ | 30 | $(top_builddir)/gobject/libgobject-2.0.la \ |
31 | diff --git a/gio/meson.build b/gio/meson.build | ||
32 | index b83d8f5..85d8b14 100644 | ||
33 | --- a/gio/meson.build | ||
34 | +++ b/gio/meson.build | ||
35 | @@ -925,6 +925,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu | ||
36 | c_args : gio_c_args, | ||
37 | # intl.lib is not compatible with SAFESEH | ||
38 | link_args : noseh_link_args, | ||
39 | + install_dir: glib_libexecdir, | ||
40 | dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) | ||
41 | |||
42 | glib_compile_schemas = executable('glib-compile-schemas', | ||