[oe-commits] [openembedded-core] 01/03: harfbuzz: remove stale pkg.m4

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 44d826327e9336d7490745d5721d79809556b177
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Tue Sep 11 10:37:36 2018 +0100

    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 at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb | 6 ++++++
 1 file changed, 6 insertions(+)

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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.