[oe-commits] Khem Raj : autoconf: Fix canadian cross build
git version control
git at git.openembedded.org
Wed Sep 9 03:37:34 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 071f70343a27aa25dcd2344118389071025ad9a7
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=071f70343a27aa25dcd2344118389071025ad9a7
Author: Khem Raj <raj.khem at gmail.com>
Date: Sat Sep 5 19:33:11 2009 -0700
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 at gmail.com>
---
recipes/autoconf/autoconf-native_2.59.bb | 2 ++
recipes/autoconf/autoconf-native_2.61.bb | 1 +
recipes/autoconf/autoconf-native_2.63.bb | 1 +
recipes/autoconf/autoconf.inc | 1 +
recipes/autoconf/autoconf213-native_2.13.bb | 2 ++
recipes/autoconf/autoconf213_2.13.bb | 2 +-
recipes/autoconf/autoconf_2.57.bb | 2 +-
recipes/autoconf/autoconf_2.59.bb | 4 +---
recipes/autoconf/autoconf_2.61.bb | 8 ++------
recipes/autoconf/autoconf_2.63.bb | 5 ++---
10 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/recipes/autoconf/autoconf-native_2.59.bb b/recipes/autoconf/autoconf-native_2.59.bb
index aa4871e..a2b9dfa 100644
--- 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 ad6cb79..b7480cd 100644
--- 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 ad6cb79..b7480cd 100644
--- 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 7761af0..a05f2ae 100644
--- 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 3954ef3..97d4413 100644
--- 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 022f696..d06822c 100644
--- 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 6c2906a..0fc5f94 100644
--- 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 f59f8fa..a8f357f 100644
--- 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 6b92dc8..c3ccacd 100644
--- 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 0230d79..6963baf 100644
--- 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 \
More information about the Openembedded-commits
mailing list