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 4e010e3..21158f6 100644 (file)
--- 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 0c9e557..d8224bb 100644 (file)
--- 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}'