diff options
author | Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | 2019-10-07 14:11:25 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-10-15 14:16:12 +0100 |
commit | e57836909bac7692d585de82faceb390f12d432a (patch) | |
tree | 8936adceb01c3b94125a3332b9c00cf04917639e /meta | |
parent | 3872716d1e552841ba7c2be28b2e5b83589c3b9f (diff) | |
download | poky-e57836909bac7692d585de82faceb390f12d432a.tar.gz |
fribidi:upgrade 1.0.5 -> 1.0.7
-fribidi/meson.patch
Removed since this is included in 1.0.7.
(From OE-Core rev: 79297c6041342f4cb67131d08368a103d9791a9a)
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/fribidi/fribidi/meson.patch | 44 | ||||
-rw-r--r-- | meta/recipes-support/fribidi/fribidi_1.0.7.bb (renamed from meta/recipes-support/fribidi/fribidi_1.0.5.bb) | 6 |
2 files changed, 3 insertions, 47 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, | ||
diff --git a/meta/recipes-support/fribidi/fribidi_1.0.5.bb b/meta/recipes-support/fribidi/fribidi_1.0.7.bb index 63b2da649c..6738884016 100644 --- a/meta/recipes-support/fribidi/fribidi_1.0.5.bb +++ b/meta/recipes-support/fribidi/fribidi_1.0.7.bb | |||
@@ -4,9 +4,9 @@ LICENSE = "LGPLv2.1+" | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" |
5 | 5 | ||
6 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ | 6 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ |
7 | file://meson.patch" | 7 | " |
8 | SRC_URI[md5sum] = "0f97f65038545340316ec0f4bd53df0b" | 8 | SRC_URI[md5sum] = "4c020b0f5136dd012ee00f1e1122f6aa" |
9 | SRC_URI[sha256sum] = "6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce" | 9 | SRC_URI[sha256sum] = "5ab5f21e9f2fc57b4b40f8ea8f14dba78a5cc46d9cf94bc5e00a58e6886a935d" |
10 | 10 | ||
11 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" | 11 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" |
12 | 12 | ||