From 03d6846eddce33351b92676758ef6f828358c506 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 8 Jan 2018 12:48:48 +0000 Subject: m4: merge two .inc files Now that oe-core only has one copy of m4, there's no need to maintain two inc files. (From OE-Core rev: a67391afd7fe8b7dc40e49c66cfd6250a077361c) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- 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 (limited to 'meta/recipes-devtools/m4') diff --git a/meta/recipes-devtools/m4/m4-1.4.18.inc b/meta/recipes-devtools/m4/m4-1.4.18.inc index d7c8648577..7790a88d75 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" + +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 2002594e89..0000000000 --- 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" -- cgit v1.2.3-54-g00ecf