aboutsummaryrefslogtreecommitdiffstats
path: root/packages/jpeg/jpeg_6b.bb
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2008-05-22 10:39:42 +0000
committerRichard Purdie <rpurdie@rpsys.net>2008-05-22 10:39:42 +0000
commitd159ea208612a4673dc9557b690336ace9c3ab0a (patch)
treea9d3451e04d86eb197254b23f02ca5a3fa055db1 /packages/jpeg/jpeg_6b.bb
parent35f18dca2645f3242e015025c79ac58da0d13748 (diff)
downloadopenembedded-d159ea208612a4673dc9557b690336ace9c3ab0a.tar.gz
jpeg: Sync with poky, massively improve libtool handling and drop pointless sections of debian patch (200k of them)
Diffstat (limited to 'packages/jpeg/jpeg_6b.bb')
-rw-r--r--packages/jpeg/jpeg_6b.bb14
1 files changed, 8 insertions, 6 deletions
diff --git a/packages/jpeg/jpeg_6b.bb b/packages/jpeg/jpeg_6b.bb
index c93aadb6ab..48771c8de5 100644
--- a/packages/jpeg/jpeg_6b.bb
+++ b/packages/jpeg/jpeg_6b.bb
@@ -6,16 +6,13 @@ PRIORITY = "required"
DEPENDS = "libtool-cross"
RPROVIDES_${PN} = "jpeg"
-
-PR = "r7"
+PR = "r8"
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://libtool.patch;patch=1 \
- "
-
+ file://libtool_tweak.patch;patch=1"
S = "${WORKDIR}/jpeg-${PV}"
inherit autotools
@@ -23,7 +20,12 @@ inherit autotools
EXTRA_OECONF="--enable-static --enable-shared"
EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool"'
-CFLAGS_append = " -D_REENTRANT"
+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