| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From 6ab00a4279823829a9b82dc9e4d055da4de88c6e Mon Sep 17 00:00:00 2001 |
| 2 | From: Markus Volk <f_l_k@t-online.de> |
| 3 | Date: Mon, 12 Dec 2022 15:42:42 +0100 |
| 4 | Subject: [PATCH] fix crosscompile |
| 5 | |
| 6 | Signed-off-by: Markus Volk <f_l_k@t-online.de> |
| 7 | |
| 8 | Upstream-Status: Inappropriate [oe-specific] |
| 9 | --- |
| 10 | data/meson.build | 2 +- |
| 11 | meson.build | 2 +- |
| 12 | tools/meson.build | 9 +++++++++ |
| 13 | 3 files changed, 11 insertions(+), 2 deletions(-) |
| 14 | |
| 15 | diff --git a/data/meson.build b/data/meson.build |
| 16 | index aea0cb25..1a085fc9 100644 |
| 17 | --- a/data/meson.build |
| 18 | +++ b/data/meson.build |
| 19 | @@ -14,7 +14,7 @@ install_data('its/metainfo.loc', |
| 20 | metainfo_with_relinfo = custom_target('gen-output', |
| 21 | input : ['../NEWS', 'org.freedesktop.appstream.cli.metainfo.xml'], |
| 22 | output : ['nol10n_withrelinfo_org.freedesktop.appstream.cli.metainfo.xml'], |
| 23 | - command : [ascli_exe, 'news-to-metainfo', '--limit=6', '@INPUT0@', '@INPUT1@', '@OUTPUT@'] |
| 24 | + command : ['appstreamcli', 'news-to-metainfo', '--limit=6', '@INPUT0@', '@INPUT1@', '@OUTPUT@'] |
| 25 | ) |
| 26 | |
| 27 | metainfo_i18n = i18n.itstool_join( |
| 28 | diff --git a/meson.build b/meson.build |
| 29 | index fd0e3373..2f273ada 100644 |
| 30 | --- a/meson.build |
| 31 | +++ b/meson.build |
| 32 | @@ -124,7 +124,7 @@ if get_option ('gir') |
| 33 | dependency('gobject-introspection-1.0', version: '>=1.56') |
| 34 | endif |
| 35 | |
| 36 | -stemmer_inc_dirs = include_directories(['/usr/include']) |
| 37 | +stemmer_inc_dirs = include_directories(['']) |
| 38 | if get_option('stemming') |
| 39 | stemmer_lib = cc.find_library('stemmer', required: true) |
| 40 | if not cc.has_header('libstemmer.h') |
| 41 | -- |
| 42 | 2.34.1 |
| 43 | |