summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/fribidi/fribidi
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-09-14 00:28:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-21 18:45:46 -0700
commit4569d6163d254d74118985f651bbf908b1e16ffd (patch)
tree2890e0ae4ea74b7f6743a948f9812edc2d34ff4d /meta/recipes-support/fribidi/fribidi
parent51749fb8dbc80e175ad03b453d9b9e8c81671549 (diff)
downloadpoky-4569d6163d254d74118985f651bbf908b1e16ffd.tar.gz
fribidi: use Meson instead of autotools
Upstream is moving to Meson, so backport a patch to use that instead of autotools. (From OE-Core rev: d297f7ebf3f62528d055e1938a9693d6f3a61935) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/fribidi/fribidi')
-rw-r--r--meta/recipes-support/fribidi/fribidi/meson.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-support/fribidi/fribidi/meson.patch b/meta/recipes-support/fribidi/fribidi/meson.patch
new file mode 100644
index 0000000000..8b3c4a991e
--- /dev/null
+++ b/meta/recipes-support/fribidi/fribidi/meson.patch
@@ -0,0 +1,44 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From f5feb6c599adb52f24656f8589868039b0d14272 Mon Sep 17 00:00:00 2001
5From: Heiko Becker <heirecka@exherbo.org>
6Date: Fri, 7 Sep 2018 20:57:11 +0200
7Subject: [PATCH] Build generator executables natively
8
9They are run during the build and not installed in the end. Without
10this one gets the following error from meson: "ERROR: Can not use
11target gen-unicode-version as a generator because it is cross-built
12and no exe wrapper is defined. You might want to set it to native
13instead."
14
15Closes #87.
16
17---
18 gen.tab/meson.build | 6 ++++--
19 1 file changed, 4 insertions(+), 2 deletions(-)
20
21diff --git a/gen.tab/meson.build b/gen.tab/meson.build
22index 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,