diff options
author | Ross Burton <ross.burton@intel.com> | 2014-05-14 11:13:19 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-29 13:42:24 +0100 |
commit | e5727ad31a58f6e2e4c9c7897331ca8b9815291e (patch) | |
tree | d6b6f2322e3e2a53cf7f29463613981d626b9c31 /meta | |
parent | 0cafa0eafed93ec91f86c1cce2c965454754c108 (diff) | |
download | poky-e5727ad31a58f6e2e4c9c7897331ca8b9815291e.tar.gz |
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)
(From OE-Core rev: 4bb76f0e21e699bd70e52b8cbd7c6986d179bd8a)
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/freetype/freetype_2.5.2.bb | 2 |
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}'" | |||
30 | 30 | ||
31 | PACKAGECONFIG ??= "" | 31 | PACKAGECONFIG ??= "" |
32 | PACKAGECONFIG[pixmap] = "--with-png,--without-png,libpng" | 32 | PACKAGECONFIG[pixmap] = "--with-png,--without-png,libpng" |
33 | # This results in a circular dependency so enabling is non-trivial | ||
34 | PACKAGECONFIG[harfbuzz] = "--with-harfbuzz,--without-harfbuzz,harfbuzz" | ||
33 | 35 | ||
34 | do_configure() { | 36 | do_configure() { |
35 | cd builds/unix | 37 | cd builds/unix |