From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 1 Aug 2006 09:59:36 +0000 (+0000)
Subject: freetype_2.2.1.bb : freetype doesnt have a DEPEND on zlib and build breaks
X-Git-Tag: Release-2010-05/1~9453^2~1032^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4187d3df8838506f6578a2b0f2fb98f98c41e151;p=openembedded.git

freetype_2.2.1.bb : freetype doesnt have a DEPEND on zlib and build breaks
if external zlib is used, so add a --without-zlib and remove the horrible
STAGING_LIBDIR hack.
---

diff --git a/packages/freetype/freetype_2.2.1.bb b/packages/freetype/freetype_2.2.1.bb
index 22a77b03c0..6f033cc076 100644
--- a/packages/freetype/freetype_2.2.1.bb
+++ b/packages/freetype/freetype_2.2.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Freetype font rendering library"
 SECTION = "libs"
 LICENSE = "freetype"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
@@ -14,6 +14,7 @@ DEFAULT_PREFERENCE = "-1"
 
 LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
 EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
+EXTRA_OECONF = "--without-zlib"
 
 do_configure() {
 	cd builds/unix
@@ -26,8 +27,6 @@ do_configure() {
 
 do_compile_prepend() {
 	${BUILD_CC} -o objs/apinames src/tools/apinames.c
-	mkdir -p ${STAGING_LIBDIR}/.libs
-	cp ${STAGING_LIBDIR}/libz* ${STAGING_LIBDIR}/.libs/
 }
 
 do_stage() {