summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-03-16 12:00:03 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-26 10:05:06 +0100
commit9f17530dcc82783ab039a34e92fc6f67487fd2dd (patch)
treee4593f07fbfd88d15b7e42602147fbced45ba2dd /meta/recipes-devtools
parent54a6f8498eb3031437fd6f889787b4a2c7ce4924 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-devtools/automake/automake.inc2
-rw-r--r--meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch118
-rw-r--r--meta/recipes-devtools/automake/automake/prefer-cpio-over-pax-for-ustar-archives.patch30
-rw-r--r--meta/recipes-devtools/automake/automake/python-libdir.patch26
-rw-r--r--meta/recipes-devtools/automake/automake_1.11.3.bb (renamed from meta/recipes-devtools/automake/automake_1.11.2.bb)9
5 files changed, 37 insertions, 148 deletions
diff --git a/meta/recipes-devtools/automake/automake.inc b/meta/recipes-devtools/automake/automake.inc
index 7eef9ec7b9..370cacadfc 100644
--- a/meta/recipes-devtools/automake/automake.inc
+++ b/meta/recipes-devtools/automake/automake.inc
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
5HOMEPAGE = "http://www.gnu.org/software/automake/" 5HOMEPAGE = "http://www.gnu.org/software/automake/"
6SECTION = "devel" 6SECTION = "devel"
7 7
8SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 " 8SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.gz"
9 9
10inherit autotools 10inherit autotools
11 11
diff --git a/meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch b/meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch
deleted file mode 100644
index f06dfe3b56..0000000000
--- a/meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch
+++ /dev/null
@@ -1,118 +0,0 @@
1Upstream-Status: Backport
2
3Backporting this patch from automake devel git tree.
4
5Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
62012/01/05
7
8
9From 4e4dae500390d2ace681e4e4bc4c590ecdca38c6 Mon Sep 17 00:00:00 2001
10From: Stefano Lattarini <stefano.lattarini@gmail.com>
11Date: Tue, 03 Jan 2012 08:06:09 +0000
12Subject: install: pkglibexec_SCRIPTS is a valid prefix/primary combination
13
14It makes little sense for `libexec_SCRIPTS' to be accepted as valid
15while `pkglibexec_SCRIPTS' is not. So fix this inconsistency by
16explicitly allowing `pkglibexec_SCRIPTS' as well. It is worth
17noting that the inconsistency has been there for a long time,
18but only the quite recent commit `v1.11-373-g9ca6326' "Warnings
19about primary/prefix mismatch fixed and extended" has made it
20noisy enough to be noticed.
21
22* automake.in (handle_scripts): Also list `pkglibexec' among the
23prefixes valid for the `SCRIPTS' primary.
24* doc/automake.texi (Scripts): Likewise.
25* tests/primary-prefix-valid-couples.test: Update.
26* THANKS: Likewise.
27* NEWS: Likewise.
28
29Reported by Dennis Schridde on the automake list:
30<http://lists.gnu.org/archive/html/automake/2012-01/msg00002.html>
31---
32diff --git a/NEWS b/NEWS
33index 599f19f..2e572e4 100644
34--- a/NEWS
35+++ b/NEWS
36@@ -82,6 +82,11 @@ New in 1.11.0a:
37
38 Bugs fixed in 1.11.0a:
39
40+* Bugs introduced by 1.11.2:
41+
42+ - Automake now correctly recognizes the prefix/primary combination
43+ `pkglibexec_SCRIPTS' as valid.
44+
45 * Bugs introduced by 1.11:
46
47 - The `parallel-tests' test driver works around a GNU make 3.80 bug with
48diff --git a/THANKS b/THANKS
49index e9da06c..e9c6db8 100644
50--- a/THANKS
51+++ b/THANKS
52@@ -78,6 +78,7 @@ David Pashley david@davidpashley.com
53 David Zaroski cz253@cleveland.Freenet.Edu
54 Dean Povey dpovey@wedgetail.com
55 Dennis J. Linse Dennis.J.Linse@SAIC.com
56+Dennis Schridde devurandom@gmx.net
57 Derek R. Price derek.price@openavenue.com
58 Diab Jerius djerius@cfa.harvard.edu
59 Didier Cassirame faded@free.fr
60diff --git a/automake.in b/automake.in
61index a852195..a689b63 100644
62--- a/automake.in
63+++ b/automake.in
64@@ -3091,7 +3091,7 @@ sub handle_scripts
65 # useful to sometimes distribute scripts verbatim. This happens
66 # e.g. in Automake itself.
67 &am_install_var ('-candist', 'scripts', 'SCRIPTS',
68- 'bin', 'sbin', 'libexec', 'pkgdata',
69+ 'bin', 'sbin', 'libexec', 'pkglibexec', 'pkgdata',
70 'noinst', 'check');
71 }
72
73diff --git a/doc/automake.texi b/doc/automake.texi
74index cebe084..0c4dc01 100644
75--- a/doc/automake.texi
76+++ b/doc/automake.texi
77@@ -7099,11 +7099,12 @@ prefix as with other primaries.
78 @vindex sbin_SCRIPTS
79 @vindex libexec_SCRIPTS
80 @vindex pkgdata_SCRIPTS
81+@vindex pkglibexec_SCRIPTS
82 @vindex noinst_SCRIPTS
83 @vindex check_SCRIPTS
84
85 Scripts can be installed in @code{bindir}, @code{sbindir},
86-@code{libexecdir}, or @code{pkgdatadir}.
87+@code{libexecdir}, @code{pkglibexecdir}, or @code{pkgdatadir}.
88
89 Scripts that need not be installed can be listed in
90 @code{noinst_SCRIPTS}, and among them, those which are needed only by
91diff --git a/tests/primary-prefix-invalid-couples.test b/tests/primary-prefix-invalid-couples.test
92index 88e0817..c3d6471 100755
93--- a/tests/primary-prefix-invalid-couples.test
94+++ b/tests/primary-prefix-invalid-couples.test
95@@ -79,7 +79,7 @@ for primary in $primaries; do
96 prefixes_ok='bin sbin libexec pkglibexec'
97 ;;
98 SCRIPTS)
99- prefixes_ok='bin sbin libexec pkgdata'
100+ prefixes_ok='bin sbin libexec pkglibexec pkgdata'
101 ;;
102 DATA)
103 prefixes_ok='data dataroot pkgdata doc html dvi pdf ps
104diff --git a/tests/primary-prefix-valid-couples.test b/tests/primary-prefix-valid-couples.test
105index 36ff5d8..6eb4149 100755
106--- a/tests/primary-prefix-valid-couples.test
107+++ b/tests/primary-prefix-valid-couples.test
108@@ -57,7 +57,7 @@ for p in lib pkglib; do
109 echo "${p}_LTLIBRARIES = libd-$p.la" >> Makefile.am
110 done
111
112-for p in bin sbin libexec pkgdata; do
113+for p in bin sbin libexec pkglibexec pkgdata; do
114 echo "${p}_SCRIPTS = $p.sh" >> Makefile.am
115 done
116
117--
118cgit v0.9.0.2
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
16Signed-off-by: Tom Rini <tom_rini@mentor.com> 16Signed-off-by: Tom Rini <tom_rini@mentor.com>
17 17
18Index: automake-1.11.1/m4/tar.m4 18Updated for version 1.11.3:
19Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
20Date: 2011/03/14
21
22Index: 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 `-'.
31Index: automake-1.11.1/Makefile.in 35Index: 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 \
diff --git a/meta/recipes-devtools/automake/automake/python-libdir.patch b/meta/recipes-devtools/automake/automake/python-libdir.patch
index 63dafca012..0783600588 100644
--- a/meta/recipes-devtools/automake/automake/python-libdir.patch
+++ b/meta/recipes-devtools/automake/automake/python-libdir.patch
@@ -2,11 +2,11 @@ Upstream-Status: Inappropriate [embedded specific]
2 2
3Signed-off-by: Kumar Gala <galak@kernel.crashing.org> 3Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
4 4
5Index: automake-1.11.1/m4/python.m4 5Index: automake-1.11.3/m4/python.m4
6=================================================================== 6===================================================================
7--- automake-1.11.1.orig/m4/python.m4 7--- automake-1.11.3.orig/m4/python.m4 2012-01-31 11:41:18.000000000 +0000
8+++ automake-1.11.1/m4/python.m4 8+++ automake-1.11.3/m4/python.m4 2012-04-24 10:04:57.726413598 +0000
9@@ -88,12 +88,13 @@ python2.1 python2.0]) 9@@ -92,12 +92,13 @@
10 [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) 10 [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
11 AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) 11 AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
12 12
@@ -22,16 +22,17 @@ Index: automake-1.11.1/m4/python.m4
22 AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) 22 AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
23 23
24 dnl At times (like when building shared libraries) you may want 24 dnl At times (like when building shared libraries) you may want
25@@ -122,7 +123,7 @@ python2.1 python2.0]) 25@@ -123,7 +124,8 @@
26 else
26 am_py_prefix=$prefix 27 am_py_prefix=$prefix
27 fi 28 fi
28 am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || 29- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null`
29- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` 30+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
30+ echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` 31+ echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
31 case $am_cv_python_pythondir in 32 case $am_cv_python_pythondir in
32 $am_py_prefix*) 33 $am_py_prefix*)
33 am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` 34 am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
34@@ -132,7 +133,7 @@ python2.1 python2.0]) 35@@ -133,7 +135,7 @@
35 case $am_py_prefix in 36 case $am_py_prefix in
36 /usr|/System*) ;; 37 /usr|/System*) ;;
37 *) 38 *)
@@ -40,16 +41,17 @@ Index: automake-1.11.1/m4/python.m4
40 ;; 41 ;;
41 esac 42 esac
42 ;; 43 ;;
43@@ -160,7 +161,7 @@ python2.1 python2.0]) 44@@ -158,7 +160,8 @@
45 else
44 am_py_exec_prefix=$exec_prefix 46 am_py_exec_prefix=$exec_prefix
45 fi 47 fi
46 am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || 48- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null`
47- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` 49+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
48+ echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` 50+ echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
49 case $am_cv_python_pyexecdir in 51 case $am_cv_python_pyexecdir in
50 $am_py_exec_prefix*) 52 $am_py_exec_prefix*)
51 am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` 53 am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
52@@ -170,7 +171,7 @@ python2.1 python2.0]) 54@@ -168,7 +171,7 @@
53 case $am_py_exec_prefix in 55 case $am_py_exec_prefix in
54 /usr|/System*) ;; 56 /usr|/System*) ;;
55 *) 57 *)
diff --git a/meta/recipes-devtools/automake/automake_1.11.2.bb b/meta/recipes-devtools/automake/automake_1.11.3.bb
index 66589fe9af..20087741ae 100644
--- a/meta/recipes-devtools/automake/automake_1.11.2.bb
+++ b/meta/recipes-devtools/automake/automake_1.11.3.bb
@@ -41,12 +41,13 @@ PERLPATH_virtclass-nativesdk = "/usr/bin/perl"
41SRC_URI += "${PATHFIXPATCH} \ 41SRC_URI += "${PATHFIXPATCH} \
42 file://prefer-cpio-over-pax-for-ustar-archives.patch \ 42 file://prefer-cpio-over-pax-for-ustar-archives.patch \
43 file://python-libdir.patch \ 43 file://python-libdir.patch \
44 file://automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch \
45 file://py-compile-compile-only-optimized-byte-code.patch" 44 file://py-compile-compile-only-optimized-byte-code.patch"
46 45
47PR = "r3" 46
48SRC_URI[md5sum] = "18194e804d415767bae8f703c963d456" 47SRC_URI[md5sum] = "93ecb319f0365cb801990b00f658d026"
49SRC_URI[sha256sum] = "4f46d1f9380c8a3506280750f630e9fc915cb1a435b724be56b499d016368718" 48SRC_URI[sha256sum] = "921b5188057e57bdd9c0ba06e21d0b0ea7dafa61a9bd08a2b041215bcff12f55"
49
50PR = "r0"
50 51
51do_install () { 52do_install () {
52 oe_runmake 'DESTDIR=${D}' install 53 oe_runmake 'DESTDIR=${D}' install