From a9095e5cb295e84ace2170bf8eb43180a0de6271 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 16 Jan 2012 08:43:57 -0800 Subject: m4: refactor .bb and .inc files The orignal had common code in the m4_1.4.16.bb file that was in the m4.inc file. m4-native was then including the m4.bb file and picking up the BBCLASSEXTEND, which causes the fetch to fail. (From OE-Core rev: 4677da625f8ceb02c96f365bb948b8901bd694a4) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/m4/m4-native_1.4.16.bb | 3 ++- meta/recipes-devtools/m4/m4.inc | 19 +++++++++++++++++++ meta/recipes-devtools/m4/m4_1.4.16.bb | 19 +------------------ 3 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 meta/recipes-devtools/m4/m4.inc (limited to 'meta/recipes-devtools/m4') 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 fa871b38ae..39ed4e8b10 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,5 @@ -require m4_${PV}.bb +require m4.inc + inherit native INHIBIT_AUTOTOOLS_DEPS = "1" diff --git a/meta/recipes-devtools/m4/m4.inc b/meta/recipes-devtools/m4/m4.inc new file mode 100644 index 0000000000..bc1dacb0c5 --- /dev/null +++ b/meta/recipes-devtools/m4/m4.inc @@ -0,0 +1,19 @@ +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}'" + diff --git a/meta/recipes-devtools/m4/m4_1.4.16.bb b/meta/recipes-devtools/m4/m4_1.4.16.bb index 58b049179a..bb4ca355d5 100644 --- a/meta/recipes-devtools/m4/m4_1.4.16.bb +++ b/meta/recipes-devtools/m4/m4_1.4.16.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 = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ - file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d" - -PR = "r1" -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}'" +require m4.inc BBCLASSEXTEND = "nativesdk" -- cgit v1.2.3-54-g00ecf