diff options
Diffstat (limited to 'meta/recipes-support/fribidi/fribidi/meson.patch')
-rw-r--r-- | meta/recipes-support/fribidi/fribidi/meson.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/meta/recipes-support/fribidi/fribidi/meson.patch b/meta/recipes-support/fribidi/fribidi/meson.patch deleted file mode 100644 index 8b3c4a991e..0000000000 --- a/meta/recipes-support/fribidi/fribidi/meson.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From f5feb6c599adb52f24656f8589868039b0d14272 Mon Sep 17 00:00:00 2001 | ||
5 | From: Heiko Becker <heirecka@exherbo.org> | ||
6 | Date: Fri, 7 Sep 2018 20:57:11 +0200 | ||
7 | Subject: [PATCH] Build generator executables natively | ||
8 | |||
9 | They are run during the build and not installed in the end. Without | ||
10 | this one gets the following error from meson: "ERROR: Can not use | ||
11 | target gen-unicode-version as a generator because it is cross-built | ||
12 | and no exe wrapper is defined. You might want to set it to native | ||
13 | instead." | ||
14 | |||
15 | Closes #87. | ||
16 | |||
17 | --- | ||
18 | gen.tab/meson.build | 6 ++++-- | ||
19 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
20 | |||
21 | diff --git a/gen.tab/meson.build b/gen.tab/meson.build | ||
22 | index 6006d98..8c21e98 100644 | ||
23 | --- a/gen.tab/meson.build | ||
24 | +++ b/gen.tab/meson.build | ||
25 | @@ -33,7 +33,8 @@ gen_unicode_version = executable('gen-unicode-version', | ||
26 | 'gen-unicode-version.c', | ||
27 | include_directories: incs, | ||
28 | c_args: native_args, | ||
29 | - install: false) | ||
30 | + install: false, | ||
31 | + native: true) | ||
32 | |||
33 | fribidi_unicode_version_h = custom_target('fribidi-unicode-version.h', | ||
34 | input: files('unidata/ReadMe.txt', 'unidata/BidiMirroring.txt'), | ||
35 | @@ -67,7 +68,8 @@ foreach tab : tabs | ||
36 | gen_prog_src, 'packtab.c', | ||
37 | include_directories: incs, | ||
38 | c_args: native_args, | ||
39 | - install: false) | ||
40 | + install: false, | ||
41 | + native: true) | ||
42 | |||
43 | tab_inc_file = custom_target(gen_prog_name, | ||
44 | input: gen_prog_inputs, | ||