summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-05 18:30:24 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-13 12:15:27 +0000
commit5b2610af779ecc612a6d6a608dd7be36585ce5e6 (patch)
tree13a28864f45a422b819ff40ed427d9a5f60e963e
parentf2a5be46cca3ea7fe8d7b1ca84b79c3181f3b774 (diff)
downloadopenembedded-core-5b2610af779ecc612a6d6a608dd7be36585ce5e6.tar.gz
openembedded-core-5b2610af779ecc612a6d6a608dd7be36585ce5e6.tar.bz2
openembedded-core-5b2610af779ecc612a6d6a608dd7be36585ce5e6.zip
m4: Drop 1.4.9 version, convert to autotools_stage
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/m4/m4-native_1.4.12.bb4
-rw-r--r--meta/packages/m4/m4_1.4.12.bb4
-rw-r--r--meta/packages/m4/m4_1.4.9.bb11
3 files changed, 3 insertions, 16 deletions
diff --git a/meta/packages/m4/m4-native_1.4.12.bb b/meta/packages/m4/m4-native_1.4.12.bb
index 64442292e0..fa871b38ae 100644
--- a/meta/packages/m4/m4-native_1.4.12.bb
+++ b/meta/packages/m4/m4-native_1.4.12.bb
@@ -10,7 +10,3 @@ do_configure() {
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
index 39b790339e..8bf64cf7d4 100644
--- a/meta/packages/m4/m4_1.4.12.bb
+++ b/meta/packages/m4/m4_1.4.12.bb
@@ -4,7 +4,9 @@ SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
file://ac_config_links.patch;patch=1"
PR = "r2"
-inherit autotools
+PR = "r1"
+
+inherit autotools_stage
EXTRA_OEMAKE += "'infodir=${infodir}'"
diff --git a/meta/packages/m4/m4_1.4.9.bb b/meta/packages/m4/m4_1.4.9.bb
deleted file mode 100644
index 8110bcc635..0000000000
--- a/meta/packages/m4/m4_1.4.9.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor."
-LICENSE = "GPLv2"
-SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
-
-inherit autotools
-
-EXTRA_OEMAKE += "'infodir=${infodir}'"
-
-do_configure() {
- oe_runconf
-}