autoconf: merged Poky changes (BBEXTENDCLASS + new staging)

Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>

6 files changed, 11 insertions, 40 deletions

diff --git a/recipes/autoconf/autoconf-native_2.59.bb b/recipes/autoconf/autoconf-native_2.59.bb
deleted file mode 100644
index a2b9dfa2d0..0000000000
--- a/recipes/autoconf/autoconf-native_2.59.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require autoconf_${PV}.bb
-
-PR = "${INC_PR}.0"
-
-DEPENDS = "m4-native gnu-config-native"
-RDEPENDS_${PN} = "m4-native gnu-config-native"
-
-S = "${WORKDIR}/autoconf-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}"
-
-inherit native
diff --git a/recipes/autoconf/autoconf-native_2.61.bb b/recipes/autoconf/autoconf-native_2.61.bb
deleted file mode 100644
index b7480cdc11..0000000000
--- a/recipes/autoconf/autoconf-native_2.61.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require autoconf_${PV}.bb
-PR = "${INC_PR}.0"
-
-DEPENDS = "m4-native gnu-config-native"
-RDEPENDS_${PN} = "m4-native gnu-config-native"
-
-SRC_URI += "file://fix_path_xtra.patch;patch=1"
-
-S = "${WORKDIR}/autoconf-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}"
-
-inherit native
diff --git a/recipes/autoconf/autoconf-native_2.63.bb b/recipes/autoconf/autoconf-native_2.63.bb
deleted file mode 100644
index b7480cdc11..0000000000
--- a/recipes/autoconf/autoconf-native_2.63.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require autoconf_${PV}.bb
-PR = "${INC_PR}.0"
-
-DEPENDS = "m4-native gnu-config-native"
-RDEPENDS_${PN} = "m4-native gnu-config-native"
-
-SRC_URI += "file://fix_path_xtra.patch;patch=1"
-
-S = "${WORKDIR}/autoconf-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}"
-
-inherit native
diff --git a/recipes/autoconf/autoconf.inc b/recipes/autoconf/autoconf.inc
index a561bf1e25..17602858cb 100644
--- a/recipes/autoconf/autoconf.inc
+++ b/recipes/autoconf/autoconf.inc
@@ -5,7 +5,10 @@ HOMEPAGE = "http://www.gnu.org/software/autoconf/"
 SECTION = "devel"
 DEPENDS += "m4-native"
 RDEPENDS_${PN} = "m4 perl gnu-config"
-INC_PR = "r8"
+DEPENDS_virtclass-native = "m4-native gnu-config-native"
+RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native"
+
+INC_PR = "r9"
 
 SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2;name=autoconf \
 	   file://program_prefix.patch;patch=1"
@@ -20,3 +23,6 @@ do_configure_prepend () {
 		export ac_cv_prog_gnu_m4="${ac_cv_prog_gnu_m4=yes}"
 	fi
 }
+
+PARALLEL_MAKE = ""
+BBCLASSEXTEND = "native"
diff --git a/recipes/autoconf/autoconf_2.61.bb b/recipes/autoconf/autoconf_2.61.bb
index 53733a90f8..e104bad6d2 100644
--- a/recipes/autoconf/autoconf_2.61.bb
+++ b/recipes/autoconf/autoconf_2.61.bb
@@ -2,8 +2,6 @@ require autoconf.inc
 
 PR = "${INC_PR}.1"
 
-PARALLEL_MAKE = ""
-
 SRC_URI += "file://autoreconf-include.patch;patch=1 \
 	   file://autoreconf-exclude.patch;patch=1 \
 	   file://autoreconf-foreign.patch;patch=1 \
@@ -12,3 +10,5 @@ SRC_URI += "file://autoreconf-include.patch;patch=1 \
 	   file://config-site.patch;patch=1 \
 	   file://autoconf-dont-execute-perl.patch;patch=1 \
 	   "
+
+SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch;patch=1"
diff --git a/recipes/autoconf/autoconf_2.63.bb b/recipes/autoconf/autoconf_2.63.bb
index e26c004f64..8c81aff658 100644
--- a/recipes/autoconf/autoconf_2.63.bb
+++ b/recipes/autoconf/autoconf_2.63.bb
@@ -4,10 +4,10 @@ PR = "${INC_PR}.0"
 
 DEFAULT_PREFERENCE = "-1"
 
-PARALLEL_MAKE = ""
-
 SRC_URI += "file://autoreconf-exclude.patch;patch=1 \
 	    file://autoreconf-foreign.patch;patch=1 \
 	    file://autoheader-nonfatal-warnings.patch;patch=1 \
 	    file://autoreconf-gnuconfigize.patch;patch=1 \
 	    file://config-site.patch;patch=1"
+
+SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch;patch=1"