diff options
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, 23 insertions, 15 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 index 90d4830df5..e638fd3b6f 100644 --- 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 | |||
@@ -1,23 +1,23 @@ | |||
1 | From 48cbdd56036728ffea431ad63cf5e2ad05cef69c Mon Sep 17 00:00:00 2001 | 1 | From bf71999b6e64d1f1919b0351b27c1c417e2b8856 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 14 Feb 2019 18:06:25 +0100 | 3 | Date: Thu, 14 Feb 2019 18:06:25 +0100 |
4 | Subject: [PATCH] Fix a couple of decisions around cross-compilation | 4 | Subject: [PATCH] Generate loaders.cache using a native tool when |
5 | cross-compiling | ||
5 | 6 | ||
6 | 1. gobject-introspection can be build when cross compiling | 7 | Otherwise meson would attempt to run a target binary. |
7 | 2. generating loaders.cache requires running a target binary which | ||
8 | we do elsewhere (in postinsts) | ||
9 | 8 | ||
10 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
11 | |||
12 | --- | 12 | --- |
13 | gdk-pixbuf/meson.build | 4 +++- | 13 | gdk-pixbuf/meson.build | 13 +++++++++++++ |
14 | 1 file changed, 3 insertions(+), 1 deletion(-) | 14 | 1 file changed, 13 insertions(+) |
15 | 15 | ||
16 | diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build | 16 | diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build |
17 | index 77c162b..fc3eb33 100644 | 17 | index 1995ffd..d692cb7 100644 |
18 | --- a/gdk-pixbuf/meson.build | 18 | --- a/gdk-pixbuf/meson.build |
19 | +++ b/gdk-pixbuf/meson.build | 19 | +++ b/gdk-pixbuf/meson.build |
20 | @@ -230,6 +230,7 @@ foreach bin: gdkpixbuf_bin | 20 | @@ -291,6 +291,7 @@ foreach bin: gdkpixbuf_bin |
21 | set_variable(bin_name.underscorify(), bin) | 21 | set_variable(bin_name.underscorify(), bin) |
22 | endforeach | 22 | endforeach |
23 | 23 | ||
@@ -25,14 +25,22 @@ index 77c162b..fc3eb33 100644 | |||
25 | # The 'loaders.cache' used for testing, so we don't accidentally | 25 | # The 'loaders.cache' used for testing, so we don't accidentally |
26 | # load the installed cache; we always build it by default | 26 | # load the installed cache; we always build it by default |
27 | loaders_cache = custom_target('loaders.cache', | 27 | loaders_cache = custom_target('loaders.cache', |
28 | @@ -241,8 +242,9 @@ loaders_cache = custom_target('loaders.cache', | 28 | @@ -302,6 +303,18 @@ loaders_cache = custom_target('loaders.cache', |
29 | ], | 29 | ], |
30 | build_by_default: true) | 30 | build_by_default: true) |
31 | loaders_dep = declare_dependency(sources: [ loaders_cache ]) | 31 | loaders_dep = declare_dependency(sources: [ loaders_cache ]) |
32 | +else | ||
33 | +loaders_cache = custom_target('loaders.cache', | ||
34 | + output: 'loaders.cache', | ||
35 | + capture: true, | ||
36 | + depends: [ dynamic_loaders_dep ], | ||
37 | + command: [ | ||
38 | + 'gdk-pixbuf-query-loaders', | ||
39 | + dynamic_loaders, | ||
40 | + ], | ||
41 | + build_by_default: true) | ||
42 | +loaders_dep = declare_dependency(sources: [ loaders_cache ]) | ||
32 | +endif | 43 | +endif |
33 | 44 | ||
34 | -build_gir = get_option('with_gir') and not meson.is_cross_build() | 45 | pkgconfig = import('pkgconfig') |
35 | +build_gir = get_option('with_gir') | 46 | pkgconfig.generate( |
36 | if build_gir | ||
37 | gir_args = [ | ||
38 | '--quiet', | ||