summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/freetype
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-09-19 11:58:36 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-19 13:14:03 +0100
commit81274f4488fbc4d68d150870735ec0181b60b451 (patch)
treeeeaf1ef46867a6b5d7ba9e42b3775cdb292a8b97 /meta/recipes-graphics/freetype
parent4ffb69648747396f0396755875fd14b4ed3aabbd (diff)
downloadopenembedded-core-contrib-81274f4488fbc4d68d150870735ec0181b60b451.tar.gz
openembedded-core-contrib-81274f4488fbc4d68d150870735ec0181b60b451.tar.bz2
openembedded-core-contrib-81274f4488fbc4d68d150870735ec0181b60b451.zip
freetype: disable bzip2 compressed font support
If we do not disable this then it is enabled sometimes and disabled at others depending on whether bzip2 has been built at the time, and worst case it will cause a race condition if bzip2 is building at the same time. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/freetype')
-rw-r--r--meta/recipes-graphics/freetype/freetype_2.4.6.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/freetype/freetype_2.4.6.bb b/meta/recipes-graphics/freetype/freetype_2.4.6.bb
index 8150dd41eb..94a389ab42 100644
--- a/meta/recipes-graphics/freetype/freetype_2.4.6.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.4.6.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=28d5381b1bef2649c59f20c20bae4f39
SECTION = "libs"
-PR = "r0"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
file://no-hardcode.patch"
@@ -28,7 +28,7 @@ inherit autotools pkgconfig binconfig
LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
EXTRA_OEMAKE_virtclass-native = ""
-EXTRA_OECONF = "--without-zlib"
+EXTRA_OECONF = "--without-zlib --without-bzip2"
do_configure() {
cd builds/unix