summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-07-05 05:18:53 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:54:03 +0100
commitbf6786ba6329c3bd920280006720ebc3db115ec6 (patch)
tree9f37f7f20270d8ebee93bda2b7796ba1331c4c26 /meta/recipes-devtools
parent83dda47b2e8ed8eafa9efb97d12a6ea201522c2f (diff)
downloadpoky-bf6786ba6329c3bd920280006720ebc3db115ec6.tar.gz
automake: upgrade from 1.11.3 to 1.12.1
(From OE-Core rev: c6b70eff7614ea774c0d8e39520f76bdce0ed977) 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>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/automake/automake/path_prog_fixes.patch40
-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]
7 automake.in | 6 ++++-- 7 automake.in | 6 ++++--
8 4 files changed, 10 insertions(+), 6 deletions(-) 8 4 files changed, 10 insertions(+), 6 deletions(-)
9 9
10Index: automake-1.10.1/Makefile.am 10Index: automake-1.12.1/aclocal.in
11=================================================================== 11===================================================================
12--- automake-1.10.1.orig/Makefile.am 2008-01-21 22:28:58.000000000 +0000 12--- automake-1.12.1.orig/aclocal.in
13+++ automake-1.10.1/Makefile.am 2008-10-10 17:21:20.000000000 +0100 13+++ automake-1.12.1/aclocal.in
14@@ -75,7 +75,8 @@
15 -e 's,[@]SHELL[@],$(SHELL),g' \
16 -e 's,[@]VERSION[@],$(VERSION),g' \
17 -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \
18- -e 's,[@]datadir[@],$(datadir),g'
19+ -e 's,[@]datadir[@],$(datadir),g' \
20+ -e 's,[@]bindir[@],$(bindir),g'
21
22 ## These files depend on Makefile so they are rebuilt if $(VERSION),
23 ## $(datadir) or other do_subst'ituted variables change.
24Index: automake-1.10.1/Makefile.in
25===================================================================
26--- automake-1.10.1.orig/Makefile.in 2008-01-21 22:29:10.000000000 +0000
27+++ automake-1.10.1/Makefile.in 2008-10-10 17:22:21.000000000 +0100
28@@ -185,7 +185,8 @@
29 -e 's,[@]SHELL[@],$(SHELL),g' \
30 -e 's,[@]VERSION[@],$(VERSION),g' \
31 -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \
32- -e 's,[@]datadir[@],$(datadir),g'
33+ -e 's,[@]datadir[@],$(datadir),g' \
34+ -e 's,[@]bindir[@],$(bindir),g'
35
36 WGET = wget
37 WGET_SV_CVS = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/
38Index: automake-1.10.1/aclocal.in
39===================================================================
40--- automake-1.10.1.orig/aclocal.in 2008-01-21 22:11:41.000000000 +0000
41+++ automake-1.10.1/aclocal.in 2008-10-10 17:21:20.000000000 +0100
42@@ -1,8 +1,8 @@ 14@@ -1,8 +1,8 @@
43-#!@PERL@ -w 15-#!@PERL@ -w
44+#!@bindir@/env perl 16+#!@bindir@/env perl
@@ -50,10 +22,10 @@ Index: automake-1.10.1/aclocal.in
50 if 0; 22 if 0;
51 23
52 # aclocal - create aclocal.m4 by scanning configure.ac 24 # aclocal - create aclocal.m4 by scanning configure.ac
53Index: automake-1.10.1/automake.in 25Index: automake-1.12.1/automake.in
54=================================================================== 26===================================================================
55--- automake-1.10.1.orig/automake.in 2008-01-21 22:11:41.000000000 +0000 27--- automake-1.12.1.orig/automake.in
56+++ automake-1.10.1/automake.in 2008-10-10 17:21:20.000000000 +0100 28+++ automake-1.12.1/automake.in
57@@ -1,8 +1,10 @@ 29@@ -1,8 +1,10 @@
58-#!@PERL@ -w 30-#!@PERL@ -w
59+#!@bindir@/env perl 31+#!@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} \
43 file://python-libdir.patch \ 43 file://python-libdir.patch \
44 file://py-compile-compile-only-optimized-byte-code.patch" 44 file://py-compile-compile-only-optimized-byte-code.patch"
45 45
46 46SRC_URI[md5sum] = "ec25c1855cacf47e4bdee76a776b96ba"
47SRC_URI[md5sum] = "93ecb319f0365cb801990b00f658d026" 47SRC_URI[sha256sum] = "24bf1640679ba4a9cbe2d36422f39a81eced7f556b576a7a2ccfc70ca85a1e2f"
48SRC_URI[sha256sum] = "921b5188057e57bdd9c0ba06e21d0b0ea7dafa61a9bd08a2b041215bcff12f55"
49 48
50PR = "r0" 49PR = "r0"
51 50