jpeg: Rip out debian libtool hacks and use libtool-cross from staging. Also set tag mode to avoid issues with modern libtool

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4451 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 8 insertions, 2 deletions

diff --git a/meta/packages/jpeg/jpeg_6b.bb b/meta/packages/jpeg/jpeg_6b.bb
index 978ae10be5..b930870bc6 100644
--- a/meta/packages/jpeg/jpeg_6b.bb
+++ b/meta/packages/jpeg/jpeg_6b.bb
@@ -5,12 +5,13 @@ PRIORITY = "required"
 
 DEPENDS = "libtool-cross"
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
            file://debian.patch;patch=1 \
            file://ldflags.patch;patch=1 \
-           file://paths.patch;patch=1"
+           file://paths.patch;patch=1 \
+           file://libtool_tweak.patch;patch=1"
 S = "${WORKDIR}/jpeg-${PV}"
 
 inherit autotools 
@@ -20,6 +21,11 @@ EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool"'
 
 CFLAGS_append = " -D_REENTRANT"
 
+do_configure_prepend () {
+        rm -f ${S}/ltconfig
+        rm -f ${S}/ltmain.sh
+}
+
 do_stage() {
         install -m 644 jconfig.h ${STAGING_INCDIR}/jconfig.h
         install -m 644 jpeglib.h ${STAGING_INCDIR}/jpeglib.h