summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-01-17 10:56:02 -0800
committerSaul Wold <sgw@linux.intel.com>2012-01-19 01:16:27 -0800
commita07e6449a19deec698f6682c97f8f5c8d3b51486 (patch)
treee2ff39dc3c44a91c179e02ed1aae3859e72119ff
parenta0f5dd25a37fe3b8664c2133e80b6214559f93f6 (diff)
downloadopenembedded-core-a07e6449a19deec698f6682c97f8f5c8d3b51486.tar.gz
openembedded-core-a07e6449a19deec698f6682c97f8f5c8d3b51486.tar.bz2
openembedded-core-a07e6449a19deec698f6682c97f8f5c8d3b51486.tar.xz
openembedded-core-a07e6449a19deec698f6682c97f8f5c8d3b51486.zip
m4: A better refactoring
Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-devtools/m4/m4-1.4.16.inc14
-rw-r--r--meta/recipes-devtools/m4/m4-1.4.9.inc13
-rw-r--r--meta/recipes-devtools/m4/m4-native_1.4.16.bb2
-rw-r--r--meta/recipes-devtools/m4/m4-native_1.4.9.bb4
-rw-r--r--meta/recipes-devtools/m4/m4.inc11
-rw-r--r--meta/recipes-devtools/m4/m4_1.4.16.bb2
-rw-r--r--meta/recipes-devtools/m4/m4_1.4.9.bb19
7 files changed, 33 insertions, 32 deletions
diff --git a/meta/recipes-devtools/m4/m4-1.4.16.inc b/meta/recipes-devtools/m4/m4-1.4.16.inc
new file mode 100644
index 000000000..139193c95
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4-1.4.16.inc
@@ -0,0 +1,14 @@
+require m4.inc
+
+LICENSE = "GPLv3"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
+ file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d"
+
+PR = "r2"
+SRC_URI += "file://ac_config_links.patch"
+
+SRC_URI[md5sum] = "a5dfb4f2b7370e9d34293d23fd09b280"
+SRC_URI[sha256sum] = "e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da"
+
+
diff --git a/meta/recipes-devtools/m4/m4-1.4.9.inc b/meta/recipes-devtools/m4/m4-1.4.9.inc
new file mode 100644
index 000000000..a5d243c3f
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4-1.4.9.inc
@@ -0,0 +1,13 @@
+require m4.inc
+
+LICENSE = "GPLv2"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe\
+ file://examples/COPYING;md5=1d49bd61dc590f014cae7173b43e3e5c"
+
+PR = "r1"
+SRC_URI += "file://fix_for_circular_dependency.patch"
+
+SRC_URI[md5sum] = "1ba8e147aff5e79bd2bfb983d86b53d5"
+SRC_URI[sha256sum] = "815ce53853fbf6493617f467389b799208b1ec98296b95be44a683f8bcfd7c47"
+
diff --git a/meta/recipes-devtools/m4/m4-native_1.4.16.bb b/meta/recipes-devtools/m4/m4-native_1.4.16.bb
index 39ed4e8b1..06d8aa244 100644
--- a/meta/recipes-devtools/m4/m4-native_1.4.16.bb
+++ b/meta/recipes-devtools/m4/m4-native_1.4.16.bb
@@ -1,4 +1,4 @@
-require m4.inc
+require m4-${PV}.inc
inherit native
diff --git a/meta/recipes-devtools/m4/m4-native_1.4.9.bb b/meta/recipes-devtools/m4/m4-native_1.4.9.bb
index fa871b38a..23a21d093 100644
--- a/meta/recipes-devtools/m4/m4-native_1.4.9.bb
+++ b/meta/recipes-devtools/m4/m4-native_1.4.9.bb
@@ -1,5 +1,4 @@
-require m4_${PV}.bb
-inherit native
+require m4-${PV}.inc
INHIBIT_AUTOTOOLS_DEPS = "1"
DEPENDS += "gnu-config-native"
@@ -10,3 +9,4 @@ do_configure() {
oe_runconf
}
+inherit native
diff --git a/meta/recipes-devtools/m4/m4.inc b/meta/recipes-devtools/m4/m4.inc
index bc1dacb0c..a13031874 100644
--- a/meta/recipes-devtools/m4/m4.inc
+++ b/meta/recipes-devtools/m4/m4.inc
@@ -2,18 +2,9 @@ SUMMARY = "Traditional Unix macro processor"
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."
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
- file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d"
-
-PR = "r2"
-SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
- file://ac_config_links.patch"
-
-SRC_URI[md5sum] = "a5dfb4f2b7370e9d34293d23fd09b280"
-SRC_URI[sha256sum] = "e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da"
inherit autotools
EXTRA_OEMAKE += "'infodir=${infodir}'"
+SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
diff --git a/meta/recipes-devtools/m4/m4_1.4.16.bb b/meta/recipes-devtools/m4/m4_1.4.16.bb
index bb4ca355d..b12c0adf3 100644
--- a/meta/recipes-devtools/m4/m4_1.4.16.bb
+++ b/meta/recipes-devtools/m4/m4_1.4.16.bb
@@ -1,3 +1,3 @@
-require m4.inc
+require m4-${PV}.inc
BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-devtools/m4/m4_1.4.9.bb b/meta/recipes-devtools/m4/m4_1.4.9.bb
index e79239b95..b12c0adf3 100644
--- a/meta/recipes-devtools/m4/m4_1.4.9.bb
+++ b/meta/recipes-devtools/m4/m4_1.4.9.bb
@@ -1,20 +1,3 @@
-SUMMARY = "Traditional Unix macro processor"
-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."
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe\
- file://examples/COPYING;md5=1d49bd61dc590f014cae7173b43e3e5c"
-
-PR = "r1"
-SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
- file://fix_for_circular_dependency.patch "
-
-SRC_URI[md5sum] = "1ba8e147aff5e79bd2bfb983d86b53d5"
-SRC_URI[sha256sum] = "815ce53853fbf6493617f467389b799208b1ec98296b95be44a683f8bcfd7c47"
-
-inherit autotools
-
-EXTRA_OEMAKE += "'infodir=${infodir}'"
+require m4-${PV}.inc
BBCLASSEXTEND = "nativesdk"