diff mbox series

harfbuzz: remove stale pkg.m4

Message ID 20180911093736.5271-1-ross.burton@intel.com
State Accepted
Commit 44d826327e9336d7490745d5721d79809556b177
Headers show
Series harfbuzz: remove stale pkg.m4 | expand

Commit Message

Ross Burton Sept. 11, 2018, 9:37 a.m. UTC 
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>

---
 meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb | 6 ++++++
 1 file changed, 6 insertions(+)

-- 
2.11.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff mbox series

Patch

diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb
index f41db989c70..b904d935317 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"