Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame^] | 1 | From 79bf322768990b28c29a9d907edcca52ff48e0b8 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com> |
| 3 | Date: Wed, 26 Jul 2023 23:21:10 +0400 |
| 4 | Subject: meson: do not rely on an exe wrapper |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> |
| 10 | |
| 11 | Upstream-Status: Backport [https://github.com/ximion/appstream/commit/79bf322768990b28c29a9d907edcca52ff48e0b8] |
| 12 | --- |
| 13 | data/meson.build | 7 +++++++ |
| 14 | 1 file changed, 7 insertions(+) |
| 15 | |
| 16 | diff --git a/data/meson.build b/data/meson.build |
| 17 | index aea0cb25..ec0e434f 100644 |
| 18 | --- a/data/meson.build |
| 19 | +++ b/data/meson.build |
| 20 | @@ -7,6 +7,13 @@ install_data('its/metainfo.its', |
| 21 | install_data('its/metainfo.loc', |
| 22 | install_dir: join_paths(get_option('datadir'), 'gettext', 'its')) |
| 23 | |
| 24 | +# Do not rely on an exe wrapper for rel-info, use the system one in that case |
| 25 | +if meson.is_cross_build() |
| 26 | + dependency('appstream', version: '>=' + as_version, native: true, |
| 27 | + not_found_message: 'Native appstream required for cross-building') |
| 28 | + ascli_exe = find_program('appstreamcli') |
| 29 | +endif |
| 30 | + |
| 31 | # NOTE: We do not translate the release notes on purpose here. |
| 32 | # If you do want to give translators a chance to translate them, |
| 33 | # ascli news-to-metainfo needs to produce a temporary file to translate |
| 34 | -- |
| 35 | 2.41.0 |
| 36 | |