From 3668a2de732b61f916464e921e6b31f2552edad8 Mon Sep 17 00:00:00 2001 From: Constantin Musca Date: Fri, 7 Sep 2012 11:22:16 +0300 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../autoconf/check-automake-cross-warning.patch | 34 ++++++++++++++++++++++ meta/recipes-devtools/autoconf/autoconf_2.69.bb | 3 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch (limited to 'meta/recipes-devtools') 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 @@ +Use --warning=cross only if supported by automake + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Constantin Musca + +--- a/bin/autoreconf.in ++++ b/bin/autoreconf.in +@@ -127,6 +127,8 @@ my $aclocal_supports_warnings = 0; + my $automake_supports_force_missing = 0; + # Does automake support -Wfoo? + my $automake_supports_warnings = 0; ++# Does automake support --warning=cross ++my $automake_supports_cross_warning = 0; + + my @prepend_include; + my @include; +@@ -191,6 +193,7 @@ sub parse_args () + $aclocal_supports_warnings = $aclocal_help =~ /--warnings/; + $automake_supports_force_missing = $automake_help =~ /--force-missing/; + $automake_supports_warnings = $automake_help =~ /--warnings/; ++ $automake_supports_cross_warning = $automake_help =~ /cross/; + + # Dispatch autoreconf's option to the tools. + # --include; +@@ -244,6 +247,8 @@ sub parse_args () + $libtoolize .= ' --debug'; + } + # --warnings; ++ @warning = grep { $_ ne "cross" } @warning ++ if ! $automake_supports_cross_warning; + if (@warning) + { + 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 @@ require autoconf.inc -PR = "r7" +PR = "r8" PARALLEL_MAKE = "" @@ -8,6 +8,7 @@ LICENSE = "GPLv2 & GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504" SRC_URI += "file://autoreconf-include.patch \ + file://check-automake-cross-warning.patch \ file://autoreconf-exclude.patch \ file://autoreconf-foreign.patch \ file://autoreconf-gnuconfigize.patch \ -- cgit v1.2.3-54-g00ecf