diff options
author | Ross Burton <ross.burton@intel.com> | 2018-09-11 10:37:36 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-11 10:46:17 +0100 |
commit | a22a2cca9b1f3f7e84ebb0ca3cf4c9b8a791d09b (patch) | |
tree | 334ec12d69748b755a4e6ec3a84a1e239bc555a9 | |
parent | 83270f072222c08adb70017a1aec8cbda426a99a (diff) | |
download | poky-a22a2cca9b1f3f7e84ebb0ca3cf4c9b8a791d09b.tar.gz |
harfbuzz: remove stale pkg.m4
harfbuzz shipped an old pkg.m4 which overruled the pkg.m4 from the sysroot.
This is now fixed upstream, but until another release is made delete it from the
source tree.
(From OE-Core rev: 44d826327e9336d7490745d5721d79809556b177)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb index f41db989c7..b904d93531 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb | |||
@@ -27,6 +27,12 @@ EXTRA_OECONF = " \ | |||
27 | --without-graphite2 \ | 27 | --without-graphite2 \ |
28 | " | 28 | " |
29 | 29 | ||
30 | do_configure_prepend() { | ||
31 | # This is ancient and can get used instead of the patched one we ship, | ||
32 | # so delete it. In 1.8.9 this should be removed upstream. | ||
33 | rm -f ${S}/m4/pkg.m4 | ||
34 | } | ||
35 | |||
30 | PACKAGES =+ "${PN}-icu ${PN}-icu-dev" | 36 | PACKAGES =+ "${PN}-icu ${PN}-icu-dev" |
31 | 37 | ||
32 | LEAD_SONAME = "libharfbuzz.so" | 38 | LEAD_SONAME = "libharfbuzz.so" |