[oe-commits] org.oe.dev libpng12: Add fix for libtool 2.2.4 from poky

[rpurdie commit]

libpng12: Add fix for libtool 2.2.4 from poky

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 15ec998d34638a57ece2c7431142d90fc08ab2e9
ViewMTN: http://monotone.openembedded.org/revision/info/15ec998d34638a57ece2c7431142d90fc08ab2e9
Files:
1
packages/libpng/libpng-1.2.20
packages/libpng/libpng-1.2.20/makefile_fix.patch
packages/libpng/libpng_1.2.20.bb
Diffs:

#
# mt diff -r60707f52a6dbbf7f01733931347c957d1bf02802 -r15ec998d34638a57ece2c7431142d90fc08ab2e9
#
#
#
# add_dir "packages/libpng/libpng-1.2.20"
# 
# add_file "packages/libpng/libpng-1.2.20/makefile_fix.patch"
#  content [1d7647157320a81bfef3180ae3f856e930777f9c]
# 
# patch "packages/libpng/libpng_1.2.20.bb"
#  from [834f2830f569db00dd0042d3325134b9431021d8]
#    to [c5fd9a2a00892b624bffc195d7bc43e21f714997]
#
============================================================
--- packages/libpng/libpng-1.2.20/makefile_fix.patch	1d7647157320a81bfef3180ae3f856e930777f9c
+++ packages/libpng/libpng-1.2.20/makefile_fix.patch	1d7647157320a81bfef3180ae3f856e930777f9c
@@ -0,0 +1,18 @@
+Old versions of libtool (1.5.10) used to set ECHO as a side effect. With
+libtool 2.2.2 we need to do this manually
+
+RP - 14/4/08
+
+Index: libpng-1.2.16/Makefile.am
+===================================================================
+--- libpng-1.2.16.orig/Makefile.am	2008-04-14 14:47:21.000000000 +0100
++++ libpng-1.2.16/Makefile.am	2008-04-14 14:47:47.000000000 +0100
+@@ -102,6 +102,8 @@
+ 			>$@.new
+ 	mv $@.new $@
+ 
++ECHO=echo
++
+ libpng.vers: libpng.sym
+ 	rm -f $@ $@.new
+ 	$(ECHO) PNG at PNGLIB_MAJOR@@PNGLIB_MINOR at _0 '{global:' > $@.new
============================================================
--- packages/libpng/libpng_1.2.20.bb	834f2830f569db00dd0042d3325134b9431021d8
+++ packages/libpng/libpng_1.2.20.bb	c5fd9a2a00892b624bffc195d7bc43e21f714997
@@ -4,9 +4,10 @@ PRIORITY = "required"
 SECTION = "libs"
 DEPENDS = "zlib"
 PRIORITY = "required"
-PR = "r0"
+PR = "r6"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2 \
+           file://makefile_fix.patch;patch=1"
 S = "${WORKDIR}/libpng-${PV}"
 
 inherit autotools binconfig pkgconfig