diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-02-20 21:10:25 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 12:35:59 +0000 |
commit | 9de595659e95f4f646d3c08fc258fd1558e9a098 (patch) | |
tree | ef37043fbc9bd9a7dbb77b23e3a7eff2203cafd6 /meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch | |
parent | f5eaa5861226c6af5fbb130603268c3d582f08a3 (diff) | |
download | poky-9de595659e95f4f646d3c08fc258fd1558e9a098.tar.gz |
gdk-pixbuf: convert from autotools to meson
Drop autotools-specific patches.
Rework jku's thumbnailer patch into meson configuration.
(From OE-Core rev: 9a1fa28c70882a514d189799df8dd087059d79d9)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch')
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch new file mode 100644 index 0000000000..90d4830df5 --- /dev/null +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 48cbdd56036728ffea431ad63cf5e2ad05cef69c Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Thu, 14 Feb 2019 18:06:25 +0100 | ||
4 | Subject: [PATCH] Fix a couple of decisions around cross-compilation | ||
5 | |||
6 | 1. gobject-introspection can be build when cross compiling | ||
7 | 2. generating loaders.cache requires running a target binary which | ||
8 | we do elsewhere (in postinsts) | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
12 | --- | ||
13 | gdk-pixbuf/meson.build | 4 +++- | ||
14 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build | ||
17 | index 77c162b..fc3eb33 100644 | ||
18 | --- a/gdk-pixbuf/meson.build | ||
19 | +++ b/gdk-pixbuf/meson.build | ||
20 | @@ -230,6 +230,7 @@ foreach bin: gdkpixbuf_bin | ||
21 | set_variable(bin_name.underscorify(), bin) | ||
22 | endforeach | ||
23 | |||
24 | +if not meson.is_cross_build() | ||
25 | # The 'loaders.cache' used for testing, so we don't accidentally | ||
26 | # load the installed cache; we always build it by default | ||
27 | loaders_cache = custom_target('loaders.cache', | ||
28 | @@ -241,8 +242,9 @@ loaders_cache = custom_target('loaders.cache', | ||
29 | ], | ||
30 | build_by_default: true) | ||
31 | loaders_dep = declare_dependency(sources: [ loaders_cache ]) | ||
32 | +endif | ||
33 | |||
34 | -build_gir = get_option('with_gir') and not meson.is_cross_build() | ||
35 | +build_gir = get_option('with_gir') | ||
36 | if build_gir | ||
37 | gir_args = [ | ||
38 | '--quiet', | ||