[OE-core] [PATCH 6/9] m4: merge two .inc files

[Dan McGregor]

On 8 January 2018 at 10:00, Ross Burton <ross.burton at intel.com> wrote:
> Now that oe-core only has one copy of m4, there's no need to maintain two inc
> files.
>
> Signed-off-by: Ross Burton <ross.burton at intel.com>
> ---
>  meta/recipes-devtools/m4/m4-1.4.18.inc | 31 +++++++++++++++++++------------
>  meta/recipes-devtools/m4/m4.inc        | 10 ----------
>  2 files changed, 19 insertions(+), 22 deletions(-)
>  delete mode 100644 meta/recipes-devtools/m4/m4.inc
>
> diff --git a/meta/recipes-devtools/m4/m4-1.4.18.inc b/meta/recipes-devtools/m4/m4-1.4.18.inc
> index d7c86485771..7790a88d759 100644
> --- a/meta/recipes-devtools/m4/m4-1.4.18.inc
> +++ b/meta/recipes-devtools/m4/m4-1.4.18.inc
> @@ -1,22 +1,29 @@
> -require m4.inc
> +SUMMARY = "Traditional Unix macro processor"
> +HOMEPAGE = "https://www.gnu.org/software/m4/m4.html"
> +DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor.  It is mostly SVR4 \
> +compatible although it has some extensions (for example, handling more than 9 positional parameters to macros). \
> +GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."
>
> -EXTRA_OECONF += "--without-libsigsegv-prefix"
> +inherit autotools texinfo
> +
> +SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
> +           file://ac_config_links.patch \
> +           file://remove-gets.patch \
> +           "
> +
> +SRC_URI_append_class-target = "file://0001-Unset-need_charset_alias-when-building-for-musl.patch"

There's no space here, so it breaks with meta-clang enabled. It only
works right now as-is because SRC_URI ends with whitespace.

I think it should be:
SRC_URI_append_class-target = "
file://0001-Unset-need_charset_alias-when-building-for-musl.patch"

> +
> +SRC_URI[md5sum] = "a077779db287adf4e12a035029002d28"
> +SRC_URI[sha256sum] = "ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab"
>
>  LICENSE = "GPLv3"
>
>  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
>                     file://examples/COPYING;md5=4031593b2166d6c47cae282d944a7ede"
>
> -SRC_URI += "file://ac_config_links.patch \
> -            file://remove-gets.patch \
> -           "
> -
> -SRC_URI_append_class-target = "\
> -           file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
> -          "
> -
>  # Fix "Argument list too long" error when len(TMPDIR) = 410
>  acpaths = "-I ./m4"
>
> -SRC_URI[md5sum] = "a077779db287adf4e12a035029002d28"
> -SRC_URI[sha256sum] = "ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab"
> +EXTRA_OECONF += "--without-libsigsegv-prefix"
> +
> +EXTRA_OEMAKE += "'infodir=${infodir}'"
> diff --git a/meta/recipes-devtools/m4/m4.inc b/meta/recipes-devtools/m4/m4.inc
> deleted file mode 100644
> index 2002594e899..00000000000
> --- a/meta/recipes-devtools/m4/m4.inc
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -SUMMARY = "Traditional Unix macro processor"
> -HOMEPAGE = "https://www.gnu.org/software/m4/m4.html"
> -DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor.  It is mostly SVR4 \
> -compatible although it has some extensions (for example, handling more than 9 positional parameters to macros). \
> -GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."
> -
> -inherit autotools texinfo
> -
> -EXTRA_OEMAKE += "'infodir=${infodir}'"
> -SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
> --
> 2.11.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core