summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2013-12-26 23:00:53 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-06 11:13:58 +0000
commit9c1d1ddf5e2c3a8beed1a2937dea0f2b9edd5c71 (patch)
tree794f378b8cdf2ab5733beb6bcac65ad12b35a342 /meta/recipes-devtools
parentfc8931b34b7bf9b0c9207d94cc21d5409e630f78 (diff)
downloadpoky-9c1d1ddf5e2c3a8beed1a2937dea0f2b9edd5c71.tar.gz
automake: upgrade to 1.14
Upgrade from 1.13.4 to 1.14: - Remove the PATHFIXPATCH variable and path_prog_fixes.patch since the problem can be fixed by the do_install_append(). - Remove prefer-cpio-over-pax-for-ustar-archives.patch since it have been fixed by the upgrade. (From OE-Core rev: a223d646de4074ec792b879b8d21497c58c7bd4a) Signed-off-by: Robert Yang <liezhi.yang@windriver.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.patch41
-rw-r--r--meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch48
-rw-r--r--meta/recipes-devtools/automake/automake_1.14.bb (renamed from meta/recipes-devtools/automake/automake_1.13.4.bb)14
3 files changed, 4 insertions, 99 deletions
diff --git a/meta/recipes-devtools/automake/automake/path_prog_fixes.patch b/meta/recipes-devtools/automake/automake/path_prog_fixes.patch
deleted file mode 100644
index 9ee0672f70..0000000000
--- a/meta/recipes-devtools/automake/automake/path_prog_fixes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3---
4 Makefile.am | 3 ++-
5 Makefile.in | 3 ++-
6 aclocal.in | 4 ++--
7 automake.in | 6 ++++--
8 4 files changed, 10 insertions(+), 6 deletions(-)
9
10Index: automake-1.12.1/aclocal.in
11===================================================================
12--- automake-1.12.1.orig/aclocal.in
13+++ automake-1.12.1/aclocal.in
14@@ -1,8 +1,8 @@
15-#!@PERL@ -w
16+#!@bindir@/env perl
17 # -*- perl -*-
18 # @configure_input@
19
20-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
21+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac'
22 if 0;
23
24 # aclocal - create aclocal.m4 by scanning configure.ac
25Index: automake-1.12.1/automake.in
26===================================================================
27--- automake-1.12.1.orig/automake.in
28+++ automake-1.12.1/automake.in
29@@ -1,8 +1,10 @@
30-#!@PERL@ -w
31+#!@bindir@/env perl
32 # -*- perl -*-
33 # @configure_input@
34
35-eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
36+use warnings;
37+
38+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac'
39 if 0;
40
41 # automake - create Makefile.in from Makefile.am
diff --git a/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch b/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch
deleted file mode 100644
index 6ffff839c5..0000000000
--- a/meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1When the user has a UID or GID that is larger than the ustar format
2supports, pax does not error out gracefully in some cases (FC13). In
3this case cpio does.
4
5See for more details: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8343
6
7Additionally drop tar.m4 out of that part of the Makefile or we end up in
8a fatal attempt to regen loop:
9
10CDPATH="${ZSH_VERSION+.}:" && cd . && perllibdir="automake-1.11.1/lib:./lib" "automake-1.11.1/aclocal" --acdir=m4 -I m4
11/bin/sh: automake-1.11.1/aclocal: No such file or directory
12make: *** [aclocal.m4] Error 127
13
14Upstream-Status: Pending
15
16Signed-off-by: Tom Rini <tom_rini@mentor.com>
17
18Updated for version 1.11.3:
19Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
20Date: 2011/03/14
21
22Updated for version 1.13.2:
23Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
24
25diff -Nurd automake-1.13.2/Makefile.in automake-1.13.2/Makefile.in
26--- automake-1.13.2/Makefile.in 2013-05-15 23:12:58.000000000 +0300
27+++ automake-1.13.2/Makefile.in 2013-05-23 02:13:41.364026301 +0300
28@@ -141,7 +141,7 @@
29 $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \
30 $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/silent.m4 \
31 $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/substnot.m4 \
32- $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac
33+ $(top_srcdir)/configure.ac
34 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
35 $(ACLOCAL_M4)
36 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
37diff -Nurd automake-1.13.2/m4/tar.m4 automake-1.13.2/m4/tar.m4
38--- automake-1.13.2/m4/tar.m4 2013-05-13 23:12:48.000000000 +0300
39+++ automake-1.13.2/m4/tar.m4 2013-05-23 02:13:26.600025805 +0300
40@@ -26,7 +26,7 @@
41 AC_SUBST([AMTAR], ['$${TAR-tar}'])
42
43 # We'll loop over all known methods to create a tar archive until one works.
44-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
45+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) cpio pax none'
46
47 m4_if([$1], [v7],
48 [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], \ No newline at end of file
diff --git a/meta/recipes-devtools/automake/automake_1.13.4.bb b/meta/recipes-devtools/automake/automake_1.14.bb
index 7630754857..de6fcfa648 100644
--- a/meta/recipes-devtools/automake/automake_1.13.4.bb
+++ b/meta/recipes-devtools/automake/automake_1.14.bb
@@ -1,6 +1,6 @@
1require automake.inc 1require automake.inc
2LICENSE = "GPLv2" 2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
4DEPENDS_class-native = "autoconf-native" 4DEPENDS_class-native = "autoconf-native"
5 5
6NAMEVER = "${@oe.utils.trim_version("${PV}", 2)}" 6NAMEVER = "${@oe.utils.trim_version("${PV}", 2)}"
@@ -18,18 +18,12 @@ RDEPENDS_${PN} += "\
18 18
19RDEPENDS_${PN}_class-native = "autoconf-native perl-native-runtime" 19RDEPENDS_${PN}_class-native = "autoconf-native perl-native-runtime"
20 20
21PATHFIXPATCH = "file://path_prog_fixes.patch" 21SRC_URI += " file://python-libdir.patch \
22PATHFIXPATCH_class-native = ""
23PATHFIXPATCH_class-nativesdk = ""
24
25SRC_URI += "${PATHFIXPATCH} \
26 file://prefer-cpio-over-pax-for-ustar-archives.patch \
27 file://python-libdir.patch \
28 file://py-compile-compile-only-optimized-byte-code.patch \ 22 file://py-compile-compile-only-optimized-byte-code.patch \
29 file://buildtest.patch" 23 file://buildtest.patch"
30 24
31SRC_URI[md5sum] = "9199e266993a5bbdc914923349d51e3e" 25SRC_URI[md5sum] = "a3c0d9298c6112f5f2c26c639ccaaed7"
32SRC_URI[sha256sum] = "4c93abc0bff54b296f41f92dd3aa1e73e554265a6f719df465574983ef6f878c" 26SRC_URI[sha256sum] = "7847424d4204d1627c129e9c15b81e145836afa2a1bf9003ffe10aa26ea75755"
33 27
34do_install_append () { 28do_install_append () {
35 install -d ${D}${datadir} 29 install -d ${D}${datadir}