aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-09-11 10:37:36 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-11 10:46:12 +0100
commit44d826327e9336d7490745d5721d79809556b177 (patch)
treef59bb3c2afd9430cb990d2e6d38ad7a7993c32b4 /meta/recipes-graphics
parenteed00380c95eebbd36cf66628ed7ef6e15678f10 (diff)
downloadopenembedded-core-contrib-44d826327e9336d7490745d5721d79809556b177.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. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb6
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 = " \
--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"