[OE-core] [PATCH] autoconf: use --warning=cross only if supported
Saul Wold
sgw at linux.intel.com
Mon Sep 10 15:57:05 UTC 2012
On 09/07/2012 01:22 AM, Constantin Musca wrote:
> Adapt autoconf to pass --warning=cross to automake only if
> supported.
>
> [YOCTO #842]
>
> Signed-off-by: Constantin Musca <constantinx.musca at intel.com>
> ---
> .../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
>
> 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 0000000..73394d7
> --- /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 <constantinx.musca at intel.com>
> +
> +--- 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 478f8ed..1ec1cb5 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 \
>
Merged into OE-Core
Thanks
Sau!
More information about the Openembedded-core
mailing list