[oe-commits] Ross Burton : freetype: disable harfbuzz

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 17131d42c02b591e1b6d547852cb09b004b8d609
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=17131d42c02b591e1b6d547852cb09b004b8d609

Author: Ross Burton <ross.burton at intel.com>
Date:   Wed May 14 11:13:19 2014 +0100

freetype: disable harfbuzz

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 at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-graphics/freetype/freetype_2.5.3.bb | 2 ++
 1 file changed, 2 insertions(+)

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