diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2008-06-01 16:10:39 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2008-06-01 16:10:39 +0000 |
| commit | 939b94a7c1f235488f4a16bfe228cf016d7c2e1d (patch) | |
| tree | 26805e91a39eda17829d24fc030ebab3854b9938 | |
| parent | 561bcc5603dc9908fae300c53d58fc8f2b9ddd90 (diff) | |
libpng12: Add fix for libtool 2.2.4 from poky
| -rw-r--r-- | packages/libpng/libpng-1.2.20/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/libpng/libpng-1.2.20/makefile_fix.patch | 18 | ||||
| -rw-r--r-- | packages/libpng/libpng_1.2.20.bb | 5 |
3 files changed, 21 insertions, 2 deletions
diff --git a/packages/libpng/libpng-1.2.20/.mtn2git_empty b/packages/libpng/libpng-1.2.20/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libpng/libpng-1.2.20/.mtn2git_empty diff --git a/packages/libpng/libpng-1.2.20/makefile_fix.patch b/packages/libpng/libpng-1.2.20/makefile_fix.patch new file mode 100644 index 0000000000..3fa8793add --- /dev/null +++ b/packages/libpng/libpng-1.2.20/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/packages/libpng/libpng_1.2.20.bb b/packages/libpng/libpng_1.2.20.bb index 3730f3d727..41bd6ec3f7 100644 --- a/packages/libpng/libpng_1.2.20.bb +++ b/packages/libpng/libpng_1.2.20.bb @@ -4,9 +4,10 @@ LICENSE = "libpng" 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 |