summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-05-14 11:13:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-29 13:42:09 +0100
commit4bb76f0e21e699bd70e52b8cbd7c6986d179bd8a (patch)
treeaa3e8ad5b94d9918e80782029e0e53b404728c93
parentfa97064172a2191fbb778565475a074d08d54f9a (diff)
downloadopenembedded-core-contrib-4bb76f0e21e699bd70e52b8cbd7c6986d179bd8a.tar.gz
openembedded-core-contrib-4bb76f0e21e699bd70e52b8cbd7c6986d179bd8a.tar.bz2
openembedded-core-contrib-4bb76f0e21e699bd70e52b8cbd7c6986d179bd8a.zip
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. (From OE-Core rev: 17131d42c02b591e1b6d547852cb09b004b8d609) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/freetype/freetype_2.5.2.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-graphics/freetype/freetype_2.5.2.bb b/meta/recipes-graphics/freetype/freetype_2.5.2.bb
index 0c62a678cd..fd8a9e184e 100644
--- a/meta/recipes-graphics/freetype/freetype_2.5.2.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.5.2.bb
@@ -30,6 +30,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