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-15 23:24:43 +0100 |
| commit | f7a74e2baaa68c90f2b3a17db480cc296c16d7a9 (patch) | |
| tree | 47102a64b2eca491fa6607ff309d516d41db6082 | |
| parent | 48fc1aac623347eaed87ec640aab0376839569c7 (diff) | |
| download | poky-f7a74e2baaa68c90f2b3a17db480cc296c16d7a9.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)
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.3.bb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-graphics/freetype/freetype_2.5.3.bb b/meta/recipes-graphics/freetype/freetype_2.5.3.bb index 7182c21943..5d239e85fa 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}'" | |||
| 26 | 26 | ||
| 27 | PACKAGECONFIG ??= "" | 27 | PACKAGECONFIG ??= "" |
| 28 | PACKAGECONFIG[pixmap] = "--with-png,--without-png,libpng" | 28 | PACKAGECONFIG[pixmap] = "--with-png,--without-png,libpng" |
| 29 | # This results in a circular dependency so enabling is non-trivial | ||
| 30 | PACKAGECONFIG[harfbuzz] = "--with-harfbuzz,--without-harfbuzz,harfbuzz" | ||
| 29 | 31 | ||
| 30 | do_configure() { | 32 | do_configure() { |
| 31 | cd builds/unix | 33 | cd builds/unix |
