summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-01-08 12:48:48 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-11 10:26:06 +0000
commit03d6846eddce33351b92676758ef6f828358c506 (patch)
tree50c048e2ec52a7a9333d5b03aa11a14519c0af05 /meta/recipes-devtools
parentb0df543737f58bd5b18957644d21cb5ef4df958d (diff)
downloadpoky-03d6846eddce33351b92676758ef6f828358c506.tar.gz
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 <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/m4/m4-1.4.18.inc31
-rw-r--r--meta/recipes-devtools/m4/m4.inc10
2 files changed, 19 insertions, 22 deletions
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 @@
1require m4.inc 1SUMMARY = "Traditional Unix macro processor"
2HOMEPAGE = "https://www.gnu.org/software/m4/m4.html"
3DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 \
4compatible although it has some extensions (for example, handling more than 9 positional parameters to macros). \
5GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."
2 6
3EXTRA_OECONF += "--without-libsigsegv-prefix" 7inherit autotools texinfo
8
9SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
10 file://ac_config_links.patch \
11 file://remove-gets.patch \
12 "
13
14SRC_URI_append_class-target = "file://0001-Unset-need_charset_alias-when-building-for-musl.patch"
15
16SRC_URI[md5sum] = "a077779db287adf4e12a035029002d28"
17SRC_URI[sha256sum] = "ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab"
4 18
5LICENSE = "GPLv3" 19LICENSE = "GPLv3"
6 20
7LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ 21LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
8 file://examples/COPYING;md5=4031593b2166d6c47cae282d944a7ede" 22 file://examples/COPYING;md5=4031593b2166d6c47cae282d944a7ede"
9 23
10SRC_URI += "file://ac_config_links.patch \
11 file://remove-gets.patch \
12 "
13
14SRC_URI_append_class-target = "\
15 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
16 "
17
18# Fix "Argument list too long" error when len(TMPDIR) = 410 24# Fix "Argument list too long" error when len(TMPDIR) = 410
19acpaths = "-I ./m4" 25acpaths = "-I ./m4"
20 26
21SRC_URI[md5sum] = "a077779db287adf4e12a035029002d28" 27EXTRA_OECONF += "--without-libsigsegv-prefix"
22SRC_URI[sha256sum] = "ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab" 28
29EXTRA_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 @@
1SUMMARY = "Traditional Unix macro processor"
2HOMEPAGE = "https://www.gnu.org/software/m4/m4.html"
3DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 \
4compatible although it has some extensions (for example, handling more than 9 positional parameters to macros). \
5GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."
6
7inherit autotools texinfo
8
9EXTRA_OEMAKE += "'infodir=${infodir}'"
10SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"