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-Do-not-write-bindir-into-pkg-config-files.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-Do-not-write-bindir-into-pkg-config-files.patch')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch new file mode 100644 index 0000000000..ede29c90ba --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 15 Feb 2019 11:17:27 +0100 | ||
4 | Subject: [PATCH] Do not write $bindir into pkg-config files | ||
5 | |||
6 | This would otherwise break when using the files to build other target | ||
7 | components (we need to rely on PATH containing the paths to utilities, | ||
8 | rather than use target paths). | ||
9 | |||
10 | Upstream-Status: Inappropriate [upstream wants the paths in .pc files] | ||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
12 | --- | ||
13 | gio/meson.build | 6 +++--- | ||
14 | glib/meson.build | 6 +++--- | ||
15 | 2 files changed, 6 insertions(+), 6 deletions(-) | ||
16 | |||
17 | diff --git a/gio/meson.build b/gio/meson.build | ||
18 | index 85d8b14..657720a 100644 | ||
19 | --- a/gio/meson.build | ||
20 | +++ b/gio/meson.build | ||
21 | @@ -813,9 +813,9 @@ pkg.generate(libraries : libgio, | ||
22 | 'schemasdir=' + join_paths('${datadir}', schemas_subdir), | ||
23 | 'bindir=' + join_paths('${prefix}', get_option('bindir')), | ||
24 | 'giomoduledir=' + giomodulesdir, | ||
25 | - 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), | ||
26 | - 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), | ||
27 | - 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen')], | ||
28 | + 'glib_compile_schemas=glib-compile-schemas', | ||
29 | + 'glib_compile_resources=glib-compile-resources', | ||
30 | + 'gdbus_codegen=gdbus-codegen'], | ||
31 | version : glib_version, | ||
32 | install_dir : glib_pkgconfigreldir, | ||
33 | filebase : 'gio-2.0', | ||
34 | diff --git a/glib/meson.build b/glib/meson.build | ||
35 | index c05c694..434e8b1 100644 | ||
36 | --- a/glib/meson.build | ||
37 | +++ b/glib/meson.build | ||
38 | @@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl], | ||
39 | subdirs : ['glib-2.0'], | ||
40 | extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, | ||
41 | variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), | ||
42 | - 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), | ||
43 | - 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), | ||
44 | - 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], | ||
45 | + 'glib_genmarshal=glib-genmarshal', | ||
46 | + 'gobject_query=gobject-query', | ||
47 | + 'glib_mkenums=glib-mkenums'], | ||
48 | version : glib_version, | ||
49 | install_dir : glib_pkgconfigreldir, | ||
50 | filebase : 'glib-2.0', | ||