diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-04-14 23:16:07 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-04-14 23:16:07 +0000 |
| commit | 993b552e4034921b2ac9d761b687a39024ac9dcb (patch) | |
| tree | e7446eea3fc5c5ae9e0b89b1d13871b0d4a8254d | |
| parent | 461d3b4a94685fe5cc3aa5f3eb0ad8b66c2949bd (diff) | |
| download | openembedded-core-993b552e4034921b2ac9d761b687a39024ac9dcb.tar.gz openembedded-core-993b552e4034921b2ac9d761b687a39024ac9dcb.tar.bz2 openembedded-core-993b552e4034921b2ac9d761b687a39024ac9dcb.zip | |
libpng: Fix makefile for libtool 2.2.2
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4267 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/libpng/libpng-1.2.16/makefile_fix.patch | 18 | ||||
| -rw-r--r-- | meta/packages/libpng/libpng_1.2.16.bb | 5 |
2 files changed, 21 insertions, 2 deletions
diff --git a/meta/packages/libpng/libpng-1.2.16/makefile_fix.patch b/meta/packages/libpng/libpng-1.2.16/makefile_fix.patch new file mode 100644 index 0000000000..3fa8793add --- /dev/null +++ b/meta/packages/libpng/libpng-1.2.16/makefile_fix.patch @@ -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@PNGLIB_MAJOR@@PNGLIB_MINOR@_0 '{global:' > $@.new diff --git a/meta/packages/libpng/libpng_1.2.16.bb b/meta/packages/libpng/libpng_1.2.16.bb index 3395bc857e..0b15018d06 100644 --- a/meta/packages/libpng/libpng_1.2.16.bb +++ b/meta/packages/libpng/libpng_1.2.16.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.libpng.org/" LICENSE = "libpng" SECTION = "libs" PRIORITY = "required" -PR = "r5" +PR = "r6" DEPENDS = "zlib" @@ -17,7 +17,8 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ ${libdir}/*.a ${libdir}/pkgconfig \ ${datadir}/aclocal ${bindir} ${sbindir}" -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 |