[oe-commits] org.oe.dev packages/jpeg/jpeg_6b.bb: Add patch that allows libjpeg to compile using libtool on varius architectures

[ifaistos commit]

packages/jpeg/jpeg_6b.bb: Add patch that allows libjpeg to compile using libtool on varius architectures

Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: f97f8afbc4e7fdea8eb851500b2513adf5494f14
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f97f8afbc4e7fdea8eb851500b2513adf5494f14
Files:
1
packages/jpeg/jpeg-6b/libtool.patch
packages/jpeg/jpeg_6b.bb
Diffs:

#
# mt diff -rb89e1b530711af5b74dadfb5165d37e4a2a9caae -rf97f8afbc4e7fdea8eb851500b2513adf5494f14
#
# 
# 
# add_file "packages/jpeg/jpeg-6b/libtool.patch"
#  content [e1f50f78f3e34e8ef56df9ac7bd8f38d088b84d8]
# 
# patch "packages/jpeg/jpeg_6b.bb"
#  from [70beed860f01f695daa7b8c13fe0ea304a441a62]
#    to [0f825c07e85f10fdd361d224cb45a1f833962d0d]
# 
============================================================
--- packages/jpeg/jpeg-6b/libtool.patch	e1f50f78f3e34e8ef56df9ac7bd8f38d088b84d8
+++ packages/jpeg/jpeg-6b/libtool.patch	e1f50f78f3e34e8ef56df9ac7bd8f38d088b84d8
@@ -0,0 +1,49 @@
+--- /orig-makefile.cfg	2007-03-13 18:09:05.000000000 +0200
++++ /makefile.cfg	2007-03-13 21:42:33.000000000 +0200
+@@ -36,8 +36,10 @@
+ # To link any special libraries, add the necessary -l commands here.
+ LDLIBS= @LIBS@
+ 
++
+ # If using GNU libtool, LIBTOOL references it; if not, LIBTOOL is empty.
+ LIBTOOL = @LIBTOOL@
++
+ # $(O) expands to "lo" if using libtool, plain "o" if not.
+ # Similarly, $(A) expands to "la" or "a".
+ O = @O@
+@@ -55,7 +57,7 @@
+ # miscellaneous OS-dependent stuff
+ SHELL= /bin/sh
+ # linker
+-LN= @LN@
++LN= $(LIBTOOL) --tag=CC --mode=link  $(CC)        
+ # file deletion command
+ RM= rm -f
+ # directory creation command
+@@ -141,7 +143,7 @@
+ 
+ # How to compile with libtool.
+ @COM_LT at .c.lo:
+- at COM_LT@	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $(srcdir)/$*.c
++ at COM_LT@	$(LIBTOOL) --tag=CC --mode=compile  $(CC) $(CFLAGS) -c $(srcdir)/$*.c
+ 
+ # How to use ansi2knr, when not using libtool.
+ @COM_A2K at .c.o:
+@@ -152,7 +154,7 @@
+ # How to use ansi2knr AND libtool.
+ @COM_A2K at .c.lo:
+ @COM_A2K@	./ansi2knr $(srcdir)/$*.c knr/$*.c
+- at COM_A2K@	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c knr/$*.c
++ at COM_A2K@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(CFLAGS) -c knr/$*.c
+ @COM_A2K@	$(RM) knr/$*.c
+ 
+ ansi2knr: ansi2knr.c
+@@ -169,7 +171,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:
============================================================
--- packages/jpeg/jpeg_6b.bb	70beed860f01f695daa7b8c13fe0ea304a441a62
+++ packages/jpeg/jpeg_6b.bb	0f825c07e85f10fdd361d224cb45a1f833962d0d
@@ -7,12 +7,15 @@ RPROVIDES_${PN} = "jpeg"
 RPROVIDES_${PN} = "jpeg"
 
 
-PR = "r6"
+PR = "r7"
 
 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.patch;patch=1 \
+           "
+
 S = "${WORKDIR}/jpeg-${PV}"
 
 inherit autotools
@@ -20,7 +23,7 @@ EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR_
 EXTRA_OECONF="--enable-static --enable-shared"
 EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool"'
 
-CFLAGS_append = " -D_REENTRANT"
+CFLAGS_append = " -D_REENTRANT" 
 
 do_stage() {
 	install -m 644 jconfig.h ${STAGING_INCDIR}/jconfig.h