From: Chris Larson <clarson@kergoth.com>
Date: Tue, 9 Sep 2003 19:17:04 +0000 (+0000)
Subject: libpng-1.2.5.oe, libjpeg-6b.oe:
X-Git-Tag: Release-2010-05/1~20880
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b772054d62e6acbf93226ab455447fe628fc700d;p=openembedded.git

libpng-1.2.5.oe, libjpeg-6b.oe:
  BUGFIX: Correct the libjpeg build.

BKrev: 3f5e2730hf7dPJ5h1MBjSc3LhnRRkQ
---

diff --git a/content/libjpeg-6b.oe b/content/libjpeg-6b.oe
index 4e010e376c..21158f6bdb 100644
--- a/content/libjpeg-6b.oe
+++ b/content/libjpeg-6b.oe
@@ -10,6 +10,11 @@ S=${WORKDIR}/jpeg-${PV}
 
 EXTRA_OECONF="--enable-static --enable-shared"
 
+# this libtool cant handle the multiword gcc
+CC:=${@oe.data.getVar("CC", d, 1).split()[-1].strip()}
+CFLAGS_append = " -D_REENTRANT"
+#export AR:=${AR} rv
+
 do_stage() {
 	install -d ${STAGING_DIR}/{bin,lib,include}
 	install -m 644 -D jconfig.h ${STAGING_DIR}/include/jconfig.h
diff --git a/content/libpng-1.2.5.oe b/content/libpng-1.2.5.oe
index 0c9e557c79..d8224bb680 100644
--- a/content/libpng-1.2.5.oe
+++ b/content/libpng-1.2.5.oe
@@ -7,7 +7,6 @@ RDEPENDS="libc6 zlib1g"
 RDEPENDS_append_libpng3=' libpng12'
 
 SRC_URI=http://www.libpng.org/pub/png/src/${P}.tar.bz2
-DEPENDS=virtual/libc
 S=${WORKDIR}/${P}
 
 EXTRA_OEMAKE_append=' ZLIBINC=${STAGING_DIR}/include ZLIBLIB=${STAGING_LIBDIR}'