diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-07-05 05:18:53 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-17 10:43:32 +0100 |
| commit | c6b70eff7614ea774c0d8e39520f76bdce0ed977 (patch) | |
| tree | 4352245336b16625ee1771d5dc393db145dac3a1 | |
| parent | 705fe4dab44e623350fc32efece87a977d53bfc4 (diff) | |
| download | openembedded-core-c6b70eff7614ea774c0d8e39520f76bdce0ed977.tar.gz openembedded-core-c6b70eff7614ea774c0d8e39520f76bdce0ed977.tar.bz2 openembedded-core-c6b70eff7614ea774c0d8e39520f76bdce0ed977.zip | |
automake: upgrade from 1.11.3 to 1.12.1
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/automake/automake/path_prog_fixes.patch | 40 | ||||
| -rw-r--r-- | meta/recipes-devtools/automake/automake_1.12.1.bb (renamed from meta/recipes-devtools/automake/automake_1.11.3.bb) | 5 |
2 files changed, 8 insertions, 37 deletions
diff --git a/meta/recipes-devtools/automake/automake/path_prog_fixes.patch b/meta/recipes-devtools/automake/automake/path_prog_fixes.patch index 312cec6b13..9ee0672f70 100644 --- a/meta/recipes-devtools/automake/automake/path_prog_fixes.patch +++ b/meta/recipes-devtools/automake/automake/path_prog_fixes.patch @@ -7,38 +7,10 @@ Upstream-Status: Inappropriate [embedded specific] automake.in | 6 ++++-- 4 files changed, 10 insertions(+), 6 deletions(-) -Index: automake-1.10.1/Makefile.am +Index: automake-1.12.1/aclocal.in =================================================================== ---- automake-1.10.1.orig/Makefile.am 2008-01-21 22:28:58.000000000 +0000 -+++ automake-1.10.1/Makefile.am 2008-10-10 17:21:20.000000000 +0100 -@@ -75,7 +75,8 @@ - -e 's,[@]SHELL[@],$(SHELL),g' \ - -e 's,[@]VERSION[@],$(VERSION),g' \ - -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \ -- -e 's,[@]datadir[@],$(datadir),g' -+ -e 's,[@]datadir[@],$(datadir),g' \ -+ -e 's,[@]bindir[@],$(bindir),g' - - ## These files depend on Makefile so they are rebuilt if $(VERSION), - ## $(datadir) or other do_subst'ituted variables change. -Index: automake-1.10.1/Makefile.in -=================================================================== ---- automake-1.10.1.orig/Makefile.in 2008-01-21 22:29:10.000000000 +0000 -+++ automake-1.10.1/Makefile.in 2008-10-10 17:22:21.000000000 +0100 -@@ -185,7 +185,8 @@ - -e 's,[@]SHELL[@],$(SHELL),g' \ - -e 's,[@]VERSION[@],$(VERSION),g' \ - -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \ -- -e 's,[@]datadir[@],$(datadir),g' -+ -e 's,[@]datadir[@],$(datadir),g' \ -+ -e 's,[@]bindir[@],$(bindir),g' - - WGET = wget - WGET_SV_CVS = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/ -Index: automake-1.10.1/aclocal.in -=================================================================== ---- automake-1.10.1.orig/aclocal.in 2008-01-21 22:11:41.000000000 +0000 -+++ automake-1.10.1/aclocal.in 2008-10-10 17:21:20.000000000 +0100 +--- automake-1.12.1.orig/aclocal.in ++++ automake-1.12.1/aclocal.in @@ -1,8 +1,8 @@ -#!@PERL@ -w +#!@bindir@/env perl @@ -50,10 +22,10 @@ Index: automake-1.10.1/aclocal.in if 0; # aclocal - create aclocal.m4 by scanning configure.ac -Index: automake-1.10.1/automake.in +Index: automake-1.12.1/automake.in =================================================================== ---- automake-1.10.1.orig/automake.in 2008-01-21 22:11:41.000000000 +0000 -+++ automake-1.10.1/automake.in 2008-10-10 17:21:20.000000000 +0100 +--- automake-1.12.1.orig/automake.in ++++ automake-1.12.1/automake.in @@ -1,8 +1,10 @@ -#!@PERL@ -w +#!@bindir@/env perl diff --git a/meta/recipes-devtools/automake/automake_1.11.3.bb b/meta/recipes-devtools/automake/automake_1.12.1.bb index 20087741ae..c2bc6a3068 100644 --- a/meta/recipes-devtools/automake/automake_1.11.3.bb +++ b/meta/recipes-devtools/automake/automake_1.12.1.bb @@ -43,9 +43,8 @@ SRC_URI += "${PATHFIXPATCH} \ file://python-libdir.patch \ file://py-compile-compile-only-optimized-byte-code.patch" - -SRC_URI[md5sum] = "93ecb319f0365cb801990b00f658d026" -SRC_URI[sha256sum] = "921b5188057e57bdd9c0ba06e21d0b0ea7dafa61a9bd08a2b041215bcff12f55" +SRC_URI[md5sum] = "ec25c1855cacf47e4bdee76a776b96ba" +SRC_URI[sha256sum] = "24bf1640679ba4a9cbe2d36422f39a81eced7f556b576a7a2ccfc70ca85a1e2f" PR = "r0" |