m4: use autotools_stage, checksum in SRC_URI, switch to .inc, add 1.4.14

Signed-off-by: Chris Larson <chris_larson@mentor.com>

12 files changed, 56 insertions, 105 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 3eb59fa5b2..8efc84769e 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -18330,26 +18330,6 @@ sha256=c1c67839d4af290aecd8f7743312aacc0a39ae99757f0910918531ef9a63e14f
 md5=445dce53fcfc7ec8f6fd31f54da8a067
 sha256=62ed44c8b2d392bdc757981ac37f05d808a0d917e4f9d95de2fbf3c2bdad41a7
 
-[ftp://ftp.gnu.org/gnu/m4/m4-1.4.11.tar.gz]
-md5=988aa098326d5f2b5b5aa4b3efe8d528
-sha256=c67b759d96471c9337d3b9f0ab2e1308f461a7dba445cfe0c3750db15b7ca77f
-
-[ftp://ftp.gnu.org/gnu/m4/m4-1.4.12.tar.gz]
-md5=0499a958a561781b125c740f18061ea8
-sha256=47e8f9a33ba06fa6710b42d6f6ded41f45027f6f4039b0a3ed887c5116bc2173
-
-[ftp://ftp.gnu.org/gnu/m4/m4-1.4.4.tar.gz]
-md5=8d1d64dbecf1494690a0f3ba8db4482a
-sha256=a116c52d314c8e3365756cb1e14c6b460d6bd28769121f92373a362497359d88
-
-[ftp://ftp.gnu.org/gnu/m4/m4-1.4.8.tar.gz]
-md5=66542b27c0ffa7513b52aed0ce5d784c
-sha256=0f4e55d362408e189d0c0f4e6929f4b5be7eb281e46cbf0ce3f035370c00bc7e
-
-[ftp://ftp.gnu.org/gnu/m4/m4-1.4.9.tar.gz]
-md5=1ba8e147aff5e79bd2bfb983d86b53d5
-sha256=815ce53853fbf6493617f467389b799208b1ec98296b95be44a683f8bcfd7c47
-
 [http://www.opensource.apple.com/darwinsource/tarballs/other/mDNSResponder-107.6.tar.gz]
 md5=aa4e0e5c57f94489463ea6576591ce9d
 sha256=43d427d3d5c78aef57a49898def469cc4cae28190462205368be1f3a0fcc0165
diff --git a/recipes/m4/m4-native_1.4.11.bb b/recipes/m4/m4-native_1.4.11.bb
index 8beb8748e3..2408013185 100644
--- a/recipes/m4/m4-native_1.4.11.bb
+++ b/recipes/m4/m4-native_1.4.11.bb
@@ -1,19 +1,11 @@
 require m4_${PV}.bb
-
 inherit native
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/m4"
-
 INHIBIT_AUTOTOOLS_DEPS = "1"
 DEPENDS += "gnu-config-native"
 
-do_configure()  {
-	install -m 0644 ${STAGING_DATADIR}/gnu-config/config.sub .
-	install -m 0644 ${STAGING_DATADIR}/gnu-config/config.guess .
+do_configure ()  {
+	install -m 0644 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub .
+	install -m 0644 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess .
 	oe_runconf
 }
-
-do_stage() {
-	install -m 0755 src/m4 ${STAGING_BINDIR}/
-}
-
diff --git a/recipes/m4/m4-native_1.4.12.bb b/recipes/m4/m4-native_1.4.12.bb
index 8beb8748e3..2408013185 100644
--- a/recipes/m4/m4-native_1.4.12.bb
+++ b/recipes/m4/m4-native_1.4.12.bb
@@ -1,19 +1,11 @@
 require m4_${PV}.bb
-
 inherit native
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/m4"
-
 INHIBIT_AUTOTOOLS_DEPS = "1"
 DEPENDS += "gnu-config-native"
 
-do_configure()  {
-	install -m 0644 ${STAGING_DATADIR}/gnu-config/config.sub .
-	install -m 0644 ${STAGING_DATADIR}/gnu-config/config.guess .
+do_configure ()  {
+	install -m 0644 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub .
+	install -m 0644 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess .
 	oe_runconf
 }
-
-do_stage() {
-	install -m 0755 src/m4 ${STAGING_BINDIR}/
-}
-
diff --git a/recipes/m4/m4-native_1.4.14.bb b/recipes/m4/m4-native_1.4.14.bb
new file mode 100644
index 0000000000..2408013185
--- /dev/null
+++ b/recipes/m4/m4-native_1.4.14.bb
@@ -0,0 +1,11 @@
+require m4_${PV}.bb
+inherit native
+
+INHIBIT_AUTOTOOLS_DEPS = "1"
+DEPENDS += "gnu-config-native"
+
+do_configure ()  {
+	install -m 0644 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub .
+	install -m 0644 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess .
+	oe_runconf
+}
diff --git a/recipes/m4/m4-native_1.4.4.bb b/recipes/m4/m4-native_1.4.4.bb
index 8beb8748e3..2408013185 100644
--- a/recipes/m4/m4-native_1.4.4.bb
+++ b/recipes/m4/m4-native_1.4.4.bb
@@ -1,19 +1,11 @@
 require m4_${PV}.bb
-
 inherit native
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/m4"
-
 INHIBIT_AUTOTOOLS_DEPS = "1"
 DEPENDS += "gnu-config-native"
 
-do_configure()  {
-	install -m 0644 ${STAGING_DATADIR}/gnu-config/config.sub .
-	install -m 0644 ${STAGING_DATADIR}/gnu-config/config.guess .
+do_configure ()  {
+	install -m 0644 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub .
+	install -m 0644 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess .
 	oe_runconf
 }
-
-do_stage() {
-	install -m 0755 src/m4 ${STAGING_BINDIR}/
-}
-
diff --git a/recipes/m4/m4-native_1.4.8.bb b/recipes/m4/m4-native_1.4.8.bb
index 8beb8748e3..2408013185 100644
--- a/recipes/m4/m4-native_1.4.8.bb
+++ b/recipes/m4/m4-native_1.4.8.bb
@@ -1,19 +1,11 @@
 require m4_${PV}.bb
-
 inherit native
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/m4"
-
 INHIBIT_AUTOTOOLS_DEPS = "1"
 DEPENDS += "gnu-config-native"
 
-do_configure()  {
-	install -m 0644 ${STAGING_DATADIR}/gnu-config/config.sub .
-	install -m 0644 ${STAGING_DATADIR}/gnu-config/config.guess .
+do_configure ()  {
+	install -m 0644 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub .
+	install -m 0644 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess .
 	oe_runconf
 }
-
-do_stage() {
-	install -m 0755 src/m4 ${STAGING_BINDIR}/
-}
-
diff --git a/recipes/m4/m4.inc b/recipes/m4/m4.inc
new file mode 100644
index 0000000000..94a5ad5dc3
--- /dev/null
+++ b/recipes/m4/m4.inc
@@ -0,0 +1,9 @@
+DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \
+processor."
+HOMEPAGE = "http://www.gnu.org/software/m4/"
+LICENSE = "GPLv3"
+INC_PR = "r0"
+
+SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.bz2;name=archive"
+
+inherit autotools_stage
diff --git a/recipes/m4/m4_1.4.11.bb b/recipes/m4/m4_1.4.11.bb
index e2676269c1..15992b582a 100644
--- a/recipes/m4/m4_1.4.11.bb
+++ b/recipes/m4/m4_1.4.11.bb
@@ -1,13 +1,6 @@
-DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \
-processor."
-LICENSE = "GPLv3"
-SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
-S = "${WORKDIR}/m4-${PV}"
+require m4.inc
 
-inherit autotools
+PR = "${INC_PR}.0"
 
-EXTRA_OEMAKE += "'infodir=${infodir}'"
-
-do_configure() {
-	oe_runconf
-}
+SRC_URI[archive.md5sum] = "96ec473c2a6f203976c028e896a01b28"
+SRC_URI[archive.sha256sum] = "0b7c686525b3f4236670f9329387d2a59e807b6a83d2b5cb9bbeb7d6ab9f8aad"
diff --git a/recipes/m4/m4_1.4.12.bb b/recipes/m4/m4_1.4.12.bb
index e2676269c1..e6e381f635 100644
--- a/recipes/m4/m4_1.4.12.bb
+++ b/recipes/m4/m4_1.4.12.bb
@@ -1,13 +1,6 @@
-DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \
-processor."
-LICENSE = "GPLv3"
-SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
-S = "${WORKDIR}/m4-${PV}"
+require m4.inc
 
-inherit autotools
+PR = "${INC_PR}.0"
 
-EXTRA_OEMAKE += "'infodir=${infodir}'"
-
-do_configure() {
-	oe_runconf
-}
+SRC_URI[archive.md5sum] = "b3587c993523dd320c318ec456876839"
+SRC_URI[archive.sha256sum] = "855217de304616931844f54bd00a1e03e92452f85de6caeec47b0e8244881ba3"
diff --git a/recipes/m4/m4_1.4.14.bb b/recipes/m4/m4_1.4.14.bb
new file mode 100644
index 0000000000..441cb365fe
--- /dev/null
+++ b/recipes/m4/m4_1.4.14.bb
@@ -0,0 +1,6 @@
+require m4.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "e6fb7d08d50d87e796069cff12a52a93"
+SRC_URI[archive.sha256sum] = "0885ffa93256353a96b1cf0bcbc4d639ed09953b687e6cc412c4048e656f4dd2"
diff --git a/recipes/m4/m4_1.4.4.bb b/recipes/m4/m4_1.4.4.bb
index 0c9f4c38ac..e3b03df5fa 100644
--- a/recipes/m4/m4_1.4.4.bb
+++ b/recipes/m4/m4_1.4.4.bb
@@ -1,10 +1,7 @@
-DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \
-processor."
-LICENSE = "GPL"
-SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
-S = "${WORKDIR}/m4-${PV}"
+require m4.inc
 
-inherit autotools
+LICENSE = "GPL"
+PR = "${INC_PR}.0"
 
-EXTRA_AUTORECONF = "--exclude=autopoint,aclocal"
-EXTRA_OEMAKE += "'infodir=${infodir}'"
+SRC_URI[archive.md5sum] = "eb93bfbcb12cf00165583302bb31a822"
+SRC_URI[archive.sha256sum] = "5a06ae07a7c7b6e9895be14015468947ef3f95182e60400e840efb25feea4b8f"
diff --git a/recipes/m4/m4_1.4.8.bb b/recipes/m4/m4_1.4.8.bb
index 77d8e822b0..83f1006109 100644
--- a/recipes/m4/m4_1.4.8.bb
+++ b/recipes/m4/m4_1.4.8.bb
@@ -1,13 +1,7 @@
-DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \
-processor."
-LICENSE = "GPL"
-SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
-S = "${WORKDIR}/m4-${PV}"
-
-inherit autotools
+require m4.inc
 
-EXTRA_OEMAKE += "'infodir=${infodir}'"
+LICENSE = "GPL"
+PR = "${INC_PR}.0"
 
-do_configure() {
-	oe_runconf
-}
+SRC_URI[archive.md5sum] = "6bbf917e5d8fab20b38d43868c3944d3"
+SRC_URI[archive.sha256sum] = "d0e6734743f9eca530ea90c289c0f1770bdf37f846561557f0b0db7f87b7d7cc"