From f285e1e75421deff88b474c199cbb2be5759a12a Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sun, 7 Mar 2010 15:21:53 -0700 Subject: m4: use autotools_stage, checksum in SRC_URI, switch to .inc, add 1.4.14 Signed-off-by: Chris Larson --- recipes/m4/m4-native_1.4.11.bb | 14 +++----------- recipes/m4/m4-native_1.4.12.bb | 14 +++----------- recipes/m4/m4-native_1.4.14.bb | 11 +++++++++++ recipes/m4/m4-native_1.4.4.bb | 14 +++----------- recipes/m4/m4-native_1.4.8.bb | 14 +++----------- recipes/m4/m4.inc | 9 +++++++++ recipes/m4/m4_1.4.11.bb | 15 ++++----------- recipes/m4/m4_1.4.12.bb | 15 ++++----------- recipes/m4/m4_1.4.14.bb | 6 ++++++ recipes/m4/m4_1.4.4.bb | 13 +++++-------- recipes/m4/m4_1.4.8.bb | 16 +++++----------- 11 files changed, 56 insertions(+), 85 deletions(-) create mode 100644 recipes/m4/m4-native_1.4.14.bb create mode 100644 recipes/m4/m4.inc create mode 100644 recipes/m4/m4_1.4.14.bb (limited to 'recipes/m4') 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" -- cgit v1.2.3