summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-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_1.11.2.bb5
2 files changed, 121 insertions, 2 deletions
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
new file mode 100644
index 0000000000..f06dfe3b56
--- /dev/null
+++ b/meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch
@@ -0,0 +1,118 @@
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_1.11.2.bb b/meta/recipes-devtools/automake/automake_1.11.2.bb
index 0a65f24fbe..4534c390ba 100644
--- a/meta/recipes-devtools/automake/automake_1.11.2.bb
+++ b/meta/recipes-devtools/automake/automake_1.11.2.bb
@@ -36,9 +36,10 @@ PATHFIXPATCH_virtclass-nativesdk = ""
36 36
37SRC_URI += "${PATHFIXPATCH} \ 37SRC_URI += "${PATHFIXPATCH} \
38 file://prefer-cpio-over-pax-for-ustar-archives.patch \ 38 file://prefer-cpio-over-pax-for-ustar-archives.patch \
39 file://python-libdir.patch" 39 file://python-libdir.patch \
40 file://automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch"
40 41
41PR = "r0" 42PR = "r1"
42SRC_URI[md5sum] = "18194e804d415767bae8f703c963d456" 43SRC_URI[md5sum] = "18194e804d415767bae8f703c963d456"
43SRC_URI[sha256sum] = "4f46d1f9380c8a3506280750f630e9fc915cb1a435b724be56b499d016368718" 44SRC_URI[sha256sum] = "4f46d1f9380c8a3506280750f630e9fc915cb1a435b724be56b499d016368718"
44 45