From 8ce2175cbada1d75ce7e57a8cdbcabe4cda96b25 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed, 31 Dec 2008 17:33:57 +0000
Subject: Add m4 1.4.12 but leave 1.4.9 as its GPLv2

---
 meta/packages/m4/m4-native_1.4.12.bb | 19 +++++++++++++++++++
 meta/packages/m4/m4-native_1.4.9.bb  | 19 -------------------
 meta/packages/m4/m4_1.4.12.bb        | 13 +++++++++++++
 meta/packages/m4/m4_1.4.9.bb         |  2 +-
 4 files changed, 33 insertions(+), 20 deletions(-)
 create mode 100644 meta/packages/m4/m4-native_1.4.12.bb
 delete mode 100644 meta/packages/m4/m4-native_1.4.9.bb
 create mode 100644 meta/packages/m4/m4_1.4.12.bb

diff --git a/meta/packages/m4/m4-native_1.4.12.bb b/meta/packages/m4/m4-native_1.4.12.bb
new file mode 100644
index 000000000..8beb8748e
--- /dev/null
+++ b/meta/packages/m4/m4-native_1.4.12.bb
@@ -0,0 +1,19 @@
+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 .
+	oe_runconf
+}
+
+do_stage() {
+	install -m 0755 src/m4 ${STAGING_BINDIR}/
+}
+
diff --git a/meta/packages/m4/m4-native_1.4.9.bb b/meta/packages/m4/m4-native_1.4.9.bb
deleted file mode 100644
index 8beb8748e..000000000
--- a/meta/packages/m4/m4-native_1.4.9.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-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 .
-	oe_runconf
-}
-
-do_stage() {
-	install -m 0755 src/m4 ${STAGING_BINDIR}/
-}
-
diff --git a/meta/packages/m4/m4_1.4.12.bb b/meta/packages/m4/m4_1.4.12.bb
new file mode 100644
index 000000000..e2676269c
--- /dev/null
+++ b/meta/packages/m4/m4_1.4.12.bb
@@ -0,0 +1,13 @@
+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}"
+
+inherit autotools
+
+EXTRA_OEMAKE += "'infodir=${infodir}'"
+
+do_configure() {
+	oe_runconf
+}
diff --git a/meta/packages/m4/m4_1.4.9.bb b/meta/packages/m4/m4_1.4.9.bb
index 77d8e822b..0f3167574 100644
--- a/meta/packages/m4/m4_1.4.9.bb
+++ b/meta/packages/m4/m4_1.4.9.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \
 processor."
-LICENSE = "GPL"
+LICENSE = "GPLv2"
 SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
 S = "${WORKDIR}/m4-${PV}"
 
-- 
cgit v1.2.3