Skip to contentSkip to conversation

harfbuzz: remove stale pkg.m4

PATCH In review Ross Burton 2 participants 2 messages Sep 11, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb | 6 ++++++
 1 file changed, 6 insertions(+)
meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb +6 -0
index f41db989c70..b904d935317 100644
@@ -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"
Signature · 1 line
2.11.0
#1 lore raw

✗ patchtest: failure for harfbuzz: remove stale pkg.m4 (rev2)

== Series Details ==

Series: harfbuzz: remove stale pkg.m4 (rev2)
Revision: 2
URL : https://patchwork.openembedded.org/series/13825/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at d638fe0cc8)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe