mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-17 04:39:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4451 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2008-05-07 15:00:30 +00:00
parent 1b969af1b9
commit 44152596ba
3 changed files with 60 additions and 7262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7260
meta/packages/jpeg/jpeg-6b/debian.patch
View File

File diff suppressed because it is too large Load Diff

52
meta/packages/jpeg/jpeg-6b/libtool_tweak.patch Normal file
View File

@@ -0,0 +1,52 @@
Index: jpeg-6b/configure
===================================================================
--- jpeg-6b.orig/configure 2008-05-07 15:53:15.000000000 +0100
+++ jpeg-6b/configure 2008-05-07 15:54:40.000000000 +0100
@@ -1532,7 +1532,7 @@
LIBTOOL="./libtool"
O="lo"
A="la"
- LN='$(LIBTOOL) --mode=link $(CC)'
+ LN='$(LIBTOOL) --tag=CC --mode=link $(CC)'
INSTALL_LIB='$(LIBTOOL) --mode=install ${INSTALL}'
INSTALL_PROGRAM="\$(LIBTOOL) --mode=install $INSTALL_PROGRAM"
else
@@ -1559,7 +1559,6 @@
if test "x$LTSTATIC" = xno; then
disable_static="--disable-static"
fi
- $srcdir/ltconfig $disable_shared $disable_static $srcdir/ltmain.sh
fi
# Select memory manager depending on user input.
Index: jpeg-6b/makefile.cfg
===================================================================
--- jpeg-6b.orig/makefile.cfg 2008-05-07 15:53:24.000000000 +0100
+++ jpeg-6b/makefile.cfg 2008-05-07 15:56:22.000000000 +0100
@@ -141,7 +141,7 @@
# How to compile with libtool.
@COM_LT@.c.lo:
-@COM_LT@ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $(srcdir)/$*.c
+@COM_LT@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c $(srcdir)/$*.c
# How to use ansi2knr, when not using libtool.
@COM_A2K@.c.o:
@@ -152,7 +152,7 @@
# How to use ansi2knr AND libtool.
@COM_A2K@.c.lo:
@COM_A2K@ ./ansi2knr $(srcdir)/$*.c knr/$*.c
-@COM_A2K@ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c knr/$*.c
+@COM_A2K@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c knr/$*.c
@COM_A2K@ $(RM) knr/$*.c
ansi2knr: ansi2knr.c
@@ -169,7 +169,7 @@
# with libtool:
libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS)
- $(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \
+ $(LIBTOOL) --tag=CC --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \
-rpath $(libdir) -version-info $(JPEG_LIB_VERSION) $(LDFLAGS)
# sample programs:

10
meta/packages/jpeg/jpeg_6b.bb
View File

@@ -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