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 | 50 |
1 files changed, 21 insertions, 29 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 e638fd3b6f..e461404918 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,4 +1,4 @@ -From bf71999b6e64d1f1919b0351b27c1c417e2b8856 Mon Sep 17 00:00:00 2001 +From be8a47e0c21e5577d4f5669d339dfec6299b25be Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 14 Feb 2019 18:06:25 +0100 Subject: [PATCH] Generate loaders.cache using a native tool when @@ -10,37 +10,29 @@ Upstream-Status: Pending Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- - gdk-pixbuf/meson.build | 13 +++++++++++++ - 1 file changed, 13 insertions(+) + gdk-pixbuf/meson.build | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build -index 1995ffd..d692cb7 100644 +index 5cddbec..78c8bd3 100644 --- a/gdk-pixbuf/meson.build +++ b/gdk-pixbuf/meson.build -@@ -291,6 +291,7 @@ foreach bin: gdkpixbuf_bin - set_variable(bin_name.underscorify(), bin) - endforeach - -+if not meson.is_cross_build() - # The 'loaders.cache' used for testing, so we don't accidentally - # load the installed cache; we always build it by default - loaders_cache = custom_target('loaders.cache', -@@ -302,6 +303,18 @@ loaders_cache = custom_target('loaders.cache', - ], - build_by_default: true) - loaders_dep = declare_dependency(sources: [ loaders_cache ]) -+else -+loaders_cache = custom_target('loaders.cache', -+ output: 'loaders.cache', -+ capture: true, -+ depends: [ dynamic_loaders_dep ], -+ command: [ -+ 'gdk-pixbuf-query-loaders', -+ dynamic_loaders, -+ ], -+ build_by_default: true) -+loaders_dep = declare_dependency(sources: [ loaders_cache ]) -+endif +@@ -324,8 +324,16 @@ if not meson.is_cross_build() + build_by_default: true) + loaders_dep = declare_dependency(sources: [ loaders_cache ]) + else +- loaders_cache = [] +- loaders_dep = declare_dependency() ++ loaders_cache = custom_target('loaders.cache', ++ output: 'loaders.cache', ++ capture: true, ++ command: [ ++ 'gdk-pixbuf-query-loaders', ++ dynamic_loaders, ++ ], ++ depends: dynamic_loaders_dep, ++ build_by_default: true) ++ loaders_dep = declare_dependency(sources: [ loaders_cache ]) + endif pkgconfig = import('pkgconfig') - pkgconfig.generate( |