From a22a2cca9b1f3f7e84ebb0ca3cf4c9b8a791d09b Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 11 Sep 2018 10:37:36 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'meta/recipes-graphics/harfbuzz') 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 = " \ --without-graphite2 \ " +do_configure_prepend() { + # This is ancient and can get used instead of the patched one we ship, + # so delete it. In 1.8.9 this should be removed upstream. + rm -f ${S}/m4/pkg.m4 +} + PACKAGES =+ "${PN}-icu ${PN}-icu-dev" LEAD_SONAME = "libharfbuzz.so" -- cgit v1.2.3-54-g00ecf