Patchwork freetype: disable harfbuzz

login
register
mail settings
Submitter Ross Burton
Date May 14, 2014, 10:13 a.m.
Message ID <1400062399-1426-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/72149/
State New
Headers show

Comments

Ross Burton - May 14, 2014, 10:13 a.m.
Freetype has an automatically detected dependency on Harfbuzz, which has a
dependency on Freetype.

To produce deterministic builds and avoid link failures when rebuilding freetype
with harfbuzz present add a PACKAGECONFIG for Harfbuzz and disable it by
default.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/freetype/freetype_2.5.3.bb |    2 ++
 1 file changed, 2 insertions(+)

Patch

diff --git a/meta/recipes-graphics/freetype/freetype_2.5.3.bb b/meta/recipes-graphics/freetype/freetype_2.5.3.bb
index 7182c21..5d239e8 100644
--- a/meta/recipes-graphics/freetype/freetype_2.5.3.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.5.3.bb
@@ -26,6 +26,8 @@  EXTRA_OECONF = "--without-zlib --without-bzip2 CC_BUILD='${BUILD_CC}'"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[pixmap] = "--with-png,--without-png,libpng"
+# This results in a circular dependency so enabling is non-trivial
+PACKAGECONFIG[harfbuzz] = "--with-harfbuzz,--without-harfbuzz,harfbuzz"
 
 do_configure() {
 	cd builds/unix