autoconf: Fix canadian cross build

* Remove RDEPENDS and DEPENDS duplication.
* path_prog_fixes.patch is not needed for 2.61
* Use INC_PR

Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/recipes/autoconf/autoconf-native_2.59.bb b/recipes/autoconf/autoconf-native_2.59.bb
index aa4871e194642586250fcc0aff352f55c960ff3e..a2b9dfa2d07d676a24f12973baf3250e25f544ee 100644 (file)
--- a/recipes/autoconf/autoconf-native_2.59.bb
+++ b/recipes/autoconf/autoconf-native_2.59.bb
@@ -1,5 +1,7 @@
 require autoconf_${PV}.bb
 
+PR = "${INC_PR}.0"
+
 DEPENDS = "m4-native gnu-config-native"
 RDEPENDS_${PN} = "m4-native gnu-config-native"
 

diff --git a/recipes/autoconf/autoconf-native_2.61.bb b/recipes/autoconf/autoconf-native_2.61.bb
index ad6cb79445b2fdd77760ebac3a05476689dffc7b..b7480cdc11dbb97cee533e710f939fda281d9230 100644 (file)
--- a/recipes/autoconf/autoconf-native_2.61.bb
+++ b/recipes/autoconf/autoconf-native_2.61.bb
@@ -1,4 +1,5 @@
 require autoconf_${PV}.bb
+PR = "${INC_PR}.0"
 
 DEPENDS = "m4-native gnu-config-native"
 RDEPENDS_${PN} = "m4-native gnu-config-native"

diff --git a/recipes/autoconf/autoconf-native_2.63.bb b/recipes/autoconf/autoconf-native_2.63.bb
index ad6cb79445b2fdd77760ebac3a05476689dffc7b..b7480cdc11dbb97cee533e710f939fda281d9230 100644 (file)
--- a/recipes/autoconf/autoconf-native_2.63.bb
+++ b/recipes/autoconf/autoconf-native_2.63.bb
@@ -1,4 +1,5 @@
 require autoconf_${PV}.bb
+PR = "${INC_PR}.0"
 
 DEPENDS = "m4-native gnu-config-native"
 RDEPENDS_${PN} = "m4-native gnu-config-native"

diff --git a/recipes/autoconf/autoconf.inc b/recipes/autoconf/autoconf.inc
index 7761af06d7e1498c5c6ec48b427bea2c3cfe2f80..a05f2ae7dba46ac821f1662262eb64ad69e9d4f8 100644 (file)
--- a/recipes/autoconf/autoconf.inc
+++ b/recipes/autoconf/autoconf.inc
@@ -10,3 +10,4 @@ SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
           file://program_prefix.patch;patch=1"
 
 inherit autotools
+INC_PR = "r6"

diff --git a/recipes/autoconf/autoconf213-native_2.13.bb b/recipes/autoconf/autoconf213-native_2.13.bb
index 3954ef3b161d4b4e683ffc86c103a441d9ded18b..97d441397e761f8760cb693eb1d986551f94d307 100644 (file)
--- a/recipes/autoconf/autoconf213-native_2.13.bb
+++ b/recipes/autoconf/autoconf213-native_2.13.bb
@@ -7,3 +7,5 @@ S = "${WORKDIR}/autoconf-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}"
 
 inherit native
+PR = "${INC_PR}.0"
+

diff --git a/recipes/autoconf/autoconf213_2.13.bb b/recipes/autoconf/autoconf213_2.13.bb
index 022f696f1d81ccda3e4607fd486b0798db719cc0..d06822c7c95878234227ef2a4cf4615df2f3aba2 100644 (file)
--- a/recipes/autoconf/autoconf213_2.13.bb
+++ b/recipes/autoconf/autoconf213_2.13.bb
@@ -1,5 +1,5 @@
 require autoconf.inc
 SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz"
-PR = "r1"
 EXTRA_OECONF = "--program-transform-name=s/\$/2.13/"
 EXTRA_OEMAKE = 'acdatadir="${datadir}/autoconf-${PV}" infodir="${datadir}/autoconf-${PV}/info"'
+PR = "${INC_PR}.0"

diff --git a/recipes/autoconf/autoconf_2.57.bb b/recipes/autoconf/autoconf_2.57.bb
index 6c2906a36235ba7b22f3a9973cc9cbaf3d1c10f4..0fc5f94b837841e1e8f8de18b1be38eda99a7a9f 100644 (file)
--- a/recipes/autoconf/autoconf_2.57.bb
+++ b/recipes/autoconf/autoconf_2.57.bb
@@ -1,2 +1,2 @@
 require autoconf.inc
-PR = "r1"
+PR = "${INC_PR}.0"

diff --git a/recipes/autoconf/autoconf_2.59.bb b/recipes/autoconf/autoconf_2.59.bb
index f59f8fa5c9229ef609fc891e3ba6b028f4325baf..a8f357fc5fea3328692045c12161aa76766dc220 100644 (file)
--- a/recipes/autoconf/autoconf_2.59.bb
+++ b/recipes/autoconf/autoconf_2.59.bb
@@ -1,8 +1,6 @@
 require autoconf.inc
 
-DEPENDS += "m4-native"
-RDEPENDS_${PN} = "m4 gnu-config"
-PR = "r6"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://autoreconf-include.patch;patch=1 \
           file://autoreconf-exclude.patch;patch=1 \

diff --git a/recipes/autoconf/autoconf_2.61.bb b/recipes/autoconf/autoconf_2.61.bb
index 6b92dc8120e911f8ed98b097d333bfbb5fbc086c..c3ccacd329b60f56546c69c6ec7cb17a665cfd7d 100644 (file)
--- a/recipes/autoconf/autoconf_2.61.bb
+++ b/recipes/autoconf/autoconf_2.61.bb
@@ -1,16 +1,12 @@
 require autoconf.inc
 
-PR = "r1"
+PR = "${INC_PR}.1"
 
 PARALLEL_MAKE = ""
 
-DEPENDS += "m4-native"
-RDEPENDS_${PN} = "m4 gnu-config"
-
 SRC_URI += "file://autoreconf-include.patch;patch=1 \
           file://autoreconf-exclude.patch;patch=1 \
           file://autoreconf-foreign.patch;patch=1 \
           file://autoreconf-gnuconfigize.patch;patch=1 \
           file://autoheader-nonfatal-warnings.patch;patch=1 \
-          file://config-site.patch;patch=1 \
-          ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
+          file://config-site.patch;patch=1 "

diff --git a/recipes/autoconf/autoconf_2.63.bb b/recipes/autoconf/autoconf_2.63.bb
index 0230d790b182e057cee174edcaa61a2a077b8f10..6963baf16907081c0e9872d65f6c514ebd818b18 100644 (file)
--- a/recipes/autoconf/autoconf_2.63.bb
+++ b/recipes/autoconf/autoconf_2.63.bb
@@ -1,12 +1,11 @@
 require autoconf.inc
 
+PR = "${INC_PR}.0"
+
 DEFAULT_PREFERENCE = "-1"
 
 PARALLEL_MAKE = ""
 
-DEPENDS += "m4-native"
-RDEPENDS_${PN} = "m4 gnu-config"
-
 SRC_URI += " \
           file://autoreconf-exclude.patch;patch=1 \
           file://autoreconf-foreign.patch;patch=1 \