From: Ross Burton Date: Wed, 14 May 2014 10:13:19 +0000 (+0100) Subject: freetype: disable harfbuzz X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~33641 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17131d42c02b591e1b6d547852cb09b004b8d609;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Saul Wold --- diff --git a/meta/recipes-graphics/freetype/freetype_2.5.3.bb b/meta/recipes-graphics/freetype/freetype_2.5.3.bb index 7182c219439..5d239e85fa9 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