diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-05-07 15:00:30 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-05-07 15:00:30 +0000 |
| commit | 44152596bab3f875057f48dbc238603aaae4df1d (patch) | |
| tree | 0a03293c5e118d54613115e4735c1d830898d030 /meta/packages/jpeg/jpeg-6b/libtool_tweak.patch | |
| parent | 1b969af1b947a0c216cf17bba73fe7d07c411c98 (diff) | |
| download | openembedded-core-44152596bab3f875057f48dbc238603aaae4df1d.tar.gz openembedded-core-44152596bab3f875057f48dbc238603aaae4df1d.tar.bz2 openembedded-core-44152596bab3f875057f48dbc238603aaae4df1d.zip | |
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
Diffstat (limited to 'meta/packages/jpeg/jpeg-6b/libtool_tweak.patch')
| -rw-r--r-- | meta/packages/jpeg/jpeg-6b/libtool_tweak.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/meta/packages/jpeg/jpeg-6b/libtool_tweak.patch b/meta/packages/jpeg/jpeg-6b/libtool_tweak.patch new file mode 100644 index 0000000000..d61476adc0 --- /dev/null +++ b/meta/packages/jpeg/jpeg-6b/libtool_tweak.patch @@ -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: |