summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-09-07 11:22:16 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-10 13:01:51 +0100
commit3668a2de732b61f916464e921e6b31f2552edad8 (patch)
tree315461d7ecfb8fc615ca3344cc998b92f48e3c1c
parent5cf953b02ea6d103b7c09d6f36c198d550d06367 (diff)
downloadpoky-3668a2de732b61f916464e921e6b31f2552edad8.tar.gz
autoconf: use --warning=cross only if supported
Adapt autoconf to pass --warning=cross to automake only if supported. [YOCTO #842] (From OE-Core rev: 16d1c8f076378d0878f332f83b7e1f5fcf16447d) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch34
-rw-r--r--meta/recipes-devtools/autoconf/autoconf_2.69.bb3
2 files changed, 36 insertions, 1 deletions
diff --git a/meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch b/meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch
new file mode 100644
index 0000000000..73394d7d52
--- /dev/null
+++ b/meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch
@@ -0,0 +1,34 @@
1Use --warning=cross only if supported by automake
2
3Upstream-Status: Inappropriate [configuration]
4
5Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
6
7--- a/bin/autoreconf.in
8+++ b/bin/autoreconf.in
9@@ -127,6 +127,8 @@ my $aclocal_supports_warnings = 0;
10 my $automake_supports_force_missing = 0;
11 # Does automake support -Wfoo?
12 my $automake_supports_warnings = 0;
13+# Does automake support --warning=cross
14+my $automake_supports_cross_warning = 0;
15
16 my @prepend_include;
17 my @include;
18@@ -191,6 +193,7 @@ sub parse_args ()
19 $aclocal_supports_warnings = $aclocal_help =~ /--warnings/;
20 $automake_supports_force_missing = $automake_help =~ /--force-missing/;
21 $automake_supports_warnings = $automake_help =~ /--warnings/;
22+ $automake_supports_cross_warning = $automake_help =~ /cross/;
23
24 # Dispatch autoreconf's option to the tools.
25 # --include;
26@@ -244,6 +247,8 @@ sub parse_args ()
27 $libtoolize .= ' --debug';
28 }
29 # --warnings;
30+ @warning = grep { $_ ne "cross" } @warning
31+ if ! $automake_supports_cross_warning;
32 if (@warning)
33 {
34 my $warn = ' --warnings=' . join (',', @warning);
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.69.bb b/meta/recipes-devtools/autoconf/autoconf_2.69.bb
index 478f8eddbc..1ec1cb52af 100644
--- a/meta/recipes-devtools/autoconf/autoconf_2.69.bb
+++ b/meta/recipes-devtools/autoconf/autoconf_2.69.bb
@@ -1,6 +1,6 @@
1require autoconf.inc 1require autoconf.inc
2 2
3PR = "r7" 3PR = "r8"
4 4
5PARALLEL_MAKE = "" 5PARALLEL_MAKE = ""
6 6
@@ -8,6 +8,7 @@ LICENSE = "GPLv2 & GPLv3"
8LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 8LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
9 file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504" 9 file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504"
10SRC_URI += "file://autoreconf-include.patch \ 10SRC_URI += "file://autoreconf-include.patch \
11 file://check-automake-cross-warning.patch \
11 file://autoreconf-exclude.patch \ 12 file://autoreconf-exclude.patch \
12 file://autoreconf-foreign.patch \ 13 file://autoreconf-foreign.patch \
13 file://autoreconf-gnuconfigize.patch \ 14 file://autoreconf-gnuconfigize.patch \