diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-03-16 12:00:03 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-26 10:05:06 +0100 |
commit | 9f17530dcc82783ab039a34e92fc6f67487fd2dd (patch) | |
tree | e4593f07fbfd88d15b7e42602147fbced45ba2dd /meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch | |
parent | 54a6f8498eb3031437fd6f889787b4a2c7ce4924 (diff) | |
download | poky-9f17530dcc82783ab039a34e92fc6f67487fd2dd.tar.gz |
automake: upgrade from 1.11.2 to 1.11.3
Removed already upstream patch:
automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch
Rebased these patches to the newer code:
automake/prefer-cpio-over-pax-for-ustar-archives.patch
automake/python-libdir.patch
Changed the tarball name from bz2 to gz, as the bz2 tar ball
is not published for the 1.11.3 version.
[RP: Fix python.m4 to preserve the tweaks that allow us to build python modules]
(From OE-Core rev: 94bf72aeae035ffade75bd9343937888bbb09c82)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch')
-rw-r--r-- | meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch | 30 |
1 files changed, 17 insertions, 13 deletions
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 index 7bc8caf4f1..4627855a1c 100644 --- 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 | |||
@@ -15,11 +15,15 @@ Upstream-Status: Pending | |||
15 | 15 | ||
16 | Signed-off-by: Tom Rini <tom_rini@mentor.com> | 16 | Signed-off-by: Tom Rini <tom_rini@mentor.com> |
17 | 17 | ||
18 | Index: automake-1.11.1/m4/tar.m4 | 18 | Updated for version 1.11.3: |
19 | Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
20 | Date: 2011/03/14 | ||
21 | |||
22 | Index: automake-1.11.3/m4/tar.m4 | ||
19 | =================================================================== | 23 | =================================================================== |
20 | --- automake-1.11.1.orig/m4/tar.m4 | 24 | --- automake-1.11.3.orig/m4/tar.m4 2012-01-31 03:41:18.000000000 -0800 |
21 | +++ automake-1.11.1/m4/tar.m4 | 25 | +++ automake-1.11.3/m4/tar.m4 2012-03-14 17:36:11.901303777 -0700 |
22 | @@ -30,7 +30,7 @@ m4_if([$1], [v7], | 26 | @@ -31,7 +31,7 @@ m4_if([$1], [v7], |
23 | [m4_fatal([Unknown tar format])]) | 27 | [m4_fatal([Unknown tar format])]) |
24 | AC_MSG_CHECKING([how to create a $1 tar archive]) | 28 | AC_MSG_CHECKING([how to create a $1 tar archive]) |
25 | # Loop over all known methods to create a tar archive until one works. | 29 | # Loop over all known methods to create a tar archive until one works. |
@@ -28,16 +32,16 @@ Index: automake-1.11.1/m4/tar.m4 | |||
28 | _am_tools=${am_cv_prog_tar_$1-$_am_tools} | 32 | _am_tools=${am_cv_prog_tar_$1-$_am_tools} |
29 | # Do not fold the above two line into one, because Tru64 sh and | 33 | # Do not fold the above two line into one, because Tru64 sh and |
30 | # Solaris sh will not grok spaces in the rhs of `-'. | 34 | # Solaris sh will not grok spaces in the rhs of `-'. |
31 | Index: automake-1.11.1/Makefile.in | 35 | Index: automake-1.11.3/Makefile.in |
32 | =================================================================== | 36 | =================================================================== |
33 | --- automake-1.11.1.orig/Makefile.in | 37 | --- automake-1.11.3.orig/Makefile.in 2012-02-01 02:37:59.000000000 -0800 |
34 | +++ automake-1.11.1/Makefile.in | 38 | +++ automake-1.11.3/Makefile.in 2012-03-14 17:38:03.530869197 -0700 |
35 | @@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a | 39 | @@ -62,7 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a |
36 | $(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/mkdirp.m4 \ | ||
37 | $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \ | 40 | $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/runlog.m4 \ |
38 | $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/strip.m4 \ | 41 | $(top_srcdir)/m4/sanity.m4 $(top_srcdir)/m4/silent.m4 \ |
39 | - $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \ | 42 | $(top_srcdir)/m4/strip.m4 $(top_srcdir)/m4/substnot.m4 \ |
40 | + $(top_srcdir)/m4/substnot.m4 \ | 43 | - $(top_srcdir)/m4/tar.m4 $(top_srcdir)/configure.ac |
41 | $(top_srcdir)/configure.ac | 44 | + $(top_srcdir)/configure.ac |
42 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 45 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
43 | $(ACLOCAL_M4) | 46 | $(ACLOCAL_M4) |
47 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ | ||