| 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 |
| cross-compiling |
| |
| Otherwise meson would attempt to run a target binary. |
| |
| Upstream-Status: Pending |
| Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| |
| --- |
| 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 5cddbec..78c8bd3 100644 |
| --- a/gdk-pixbuf/meson.build |
| +++ b/gdk-pixbuf/meson.build |
| @@ -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') |