diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2021-01-19 14:45:40 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-20 22:46:17 +0000 |
commit | 4be8cde677e3a8601b35d0c50a45c5dfb5157311 (patch) | |
tree | 1150bb710b838ae21404865b21b9f615ca0c17cb /meta/recipes-graphics/harfbuzz/harfbuzz/0001-Do-not-disable-introspection-in-cross-builds.patch | |
parent | 7dab9f87dd7dfa13d318fb4fd739708d5f15d7ae (diff) | |
download | poky-4be8cde677e3a8601b35d0c50a45c5dfb5157311.tar.gz |
harfbuzz: upgrade 2.7.2 -> 2.7.4
Remove backported patches and remove the introspection patch as that is
no longer needed.
(From OE-Core rev: 94bc7f8c2442f6627b001f1dd40c0023260b22e8)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/harfbuzz/harfbuzz/0001-Do-not-disable-introspection-in-cross-builds.patch')
-rw-r--r-- | meta/recipes-graphics/harfbuzz/harfbuzz/0001-Do-not-disable-introspection-in-cross-builds.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Do-not-disable-introspection-in-cross-builds.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Do-not-disable-introspection-in-cross-builds.patch deleted file mode 100644 index d00656fc88..0000000000 --- a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Do-not-disable-introspection-in-cross-builds.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From df5848f423ec0f4b3e519900014349a0c00b1969 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 17 Aug 2020 16:36:03 +0200 | ||
4 | Subject: [PATCH] Do not disable introspection in cross builds. | ||
5 | |||
6 | Yocto can and does support introspection cross builds, through | ||
7 | running target binaries under qemu emulation. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | --- | ||
12 | src/meson.build | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/src/meson.build b/src/meson.build | ||
16 | index 1865633..5e1787c 100644 | ||
17 | --- a/src/meson.build | ||
18 | +++ b/src/meson.build | ||
19 | @@ -634,7 +634,7 @@ if have_gobject | ||
20 | gir = find_program('g-ir-scanner', required: get_option('introspection')) | ||
21 | build_gir = gir.found() | ||
22 | |||
23 | - build_gir = build_gir and not meson.is_cross_build() | ||
24 | + build_gir = build_gir | ||
25 | if not build_gir and get_option('introspection').enabled() | ||
26 | error('Introspection support is requested but it isn\'t available in cross builds') | ||
27 | endif | ||