[oe-commits] Rolf Leggewie : intltool: move dependency on libxml-parser-perl-native to inc file
git version control
git at git.openembedded.org
Thu Aug 27 18:37:24 UTC 2009
Module: openembedded.git
Branch: master
Commit: 7ad8e99f3c04c4e54c9078d8361fcae3a862e37f
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7ad8e99f3c04c4e54c9078d8361fcae3a862e37f
Author: Rolf Leggewie <oe-devel at rolf.leggewie.biz>
Date: Thu Aug 27 20:32:46 2009 +0200
intltool: move dependency on libxml-parser-perl-native to inc file
* introduce INC_PR while we're at it
---
recipes/intltool/intltool-native_0.30.bb | 1 -
recipes/intltool/intltool-native_0.31.bb | 1 -
recipes/intltool/intltool-native_0.34.bb | 1 -
recipes/intltool/intltool-native_0.35.0.bb | 1 -
recipes/intltool/intltool-native_0.35.5.bb | 1 -
recipes/intltool/intltool-native_0.37.1.bb | 1 -
recipes/intltool/intltool-native_0.40.3.bb | 3 ---
recipes/intltool/intltool.inc | 2 ++
recipes/intltool/intltool_0.30.bb | 3 +++
recipes/intltool/intltool_0.31.bb | 3 +++
recipes/intltool/intltool_0.34.bb | 3 +++
recipes/intltool/intltool_0.35.0.bb | 6 ++----
recipes/intltool/intltool_0.35.2.bb | 5 ++---
recipes/intltool/intltool_0.35.5.bb | 6 ++----
recipes/intltool/intltool_0.37.1.bb | 3 +++
recipes/intltool/intltool_0.40.3.bb | 2 +-
16 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/recipes/intltool/intltool-native_0.30.bb b/recipes/intltool/intltool-native_0.30.bb
index 05f7efd..6801a67 100644
--- a/recipes/intltool/intltool-native_0.30.bb
+++ b/recipes/intltool/intltool-native_0.30.bb
@@ -1,4 +1,3 @@
require intltool_${PV}.bb
inherit native
-DEPENDS = "libxml-parser-perl-native"
diff --git a/recipes/intltool/intltool-native_0.31.bb b/recipes/intltool/intltool-native_0.31.bb
index 05f7efd..6801a67 100644
--- a/recipes/intltool/intltool-native_0.31.bb
+++ b/recipes/intltool/intltool-native_0.31.bb
@@ -1,4 +1,3 @@
require intltool_${PV}.bb
inherit native
-DEPENDS = "libxml-parser-perl-native"
diff --git a/recipes/intltool/intltool-native_0.34.bb b/recipes/intltool/intltool-native_0.34.bb
index 05f7efd..6801a67 100644
--- a/recipes/intltool/intltool-native_0.34.bb
+++ b/recipes/intltool/intltool-native_0.34.bb
@@ -1,4 +1,3 @@
require intltool_${PV}.bb
inherit native
-DEPENDS = "libxml-parser-perl-native"
diff --git a/recipes/intltool/intltool-native_0.35.0.bb b/recipes/intltool/intltool-native_0.35.0.bb
index bac5378..1d14d89 100644
--- a/recipes/intltool/intltool-native_0.35.0.bb
+++ b/recipes/intltool/intltool-native_0.35.0.bb
@@ -1,7 +1,6 @@
require intltool_${PV}.bb
inherit native
-DEPENDS = "libxml-parser-perl-native"
export PERL = "/usr/bin/env perl"
SRC_URI_append = " file://intltool-nowarn.patch;patch=1"
diff --git a/recipes/intltool/intltool-native_0.35.5.bb b/recipes/intltool/intltool-native_0.35.5.bb
index ba9b90c..debef1c 100644
--- a/recipes/intltool/intltool-native_0.35.5.bb
+++ b/recipes/intltool/intltool-native_0.35.5.bb
@@ -1,7 +1,6 @@
require intltool_${PV}.bb
inherit native
-DEPENDS = "libxml-parser-perl-native"
export PERL = "/usr/bin/env perl"
SRC_URI_append = " file://intltool-nowarn.patch;patch=1"
diff --git a/recipes/intltool/intltool-native_0.37.1.bb b/recipes/intltool/intltool-native_0.37.1.bb
index bac5378..1d14d89 100644
--- a/recipes/intltool/intltool-native_0.37.1.bb
+++ b/recipes/intltool/intltool-native_0.37.1.bb
@@ -1,7 +1,6 @@
require intltool_${PV}.bb
inherit native
-DEPENDS = "libxml-parser-perl-native"
export PERL = "/usr/bin/env perl"
SRC_URI_append = " file://intltool-nowarn.patch;patch=1"
diff --git a/recipes/intltool/intltool-native_0.40.3.bb b/recipes/intltool/intltool-native_0.40.3.bb
index b9550cc..37198a5 100644
--- a/recipes/intltool/intltool-native_0.40.3.bb
+++ b/recipes/intltool/intltool-native_0.40.3.bb
@@ -1,9 +1,6 @@
require intltool_${PV}.bb
-PR = "r2"
-
inherit native
-DEPENDS = "libxml-parser-perl-native"
EXTRA_OEMAKE = "'PERL_TARGET=/usr/bin/env perl'"
diff --git a/recipes/intltool/intltool.inc b/recipes/intltool/intltool.inc
index 410a89c..1938407 100644
--- a/recipes/intltool/intltool.inc
+++ b/recipes/intltool/intltool.inc
@@ -2,6 +2,8 @@ DESCRIPTION = "Utility scripts for internationalizing XML"
PRIORITY = "optional"
SECTION = "devel"
LICENSE = "GPL"
+DEPENDS += "libxml-parser-perl-native"
+INC_PR = "r2"
URLV="${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}"
SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2"
diff --git a/recipes/intltool/intltool_0.30.bb b/recipes/intltool/intltool_0.30.bb
index e482625..04bd71f 100644
--- a/recipes/intltool/intltool_0.30.bb
+++ b/recipes/intltool/intltool_0.30.bb
@@ -1 +1,4 @@
require intltool.inc
+
+PR = "${INC_PR}.1"
+
diff --git a/recipes/intltool/intltool_0.31.bb b/recipes/intltool/intltool_0.31.bb
index e482625..04bd71f 100644
--- a/recipes/intltool/intltool_0.31.bb
+++ b/recipes/intltool/intltool_0.31.bb
@@ -1 +1,4 @@
require intltool.inc
+
+PR = "${INC_PR}.1"
+
diff --git a/recipes/intltool/intltool_0.34.bb b/recipes/intltool/intltool_0.34.bb
index e482625..04bd71f 100644
--- a/recipes/intltool/intltool_0.34.bb
+++ b/recipes/intltool/intltool_0.34.bb
@@ -1 +1,4 @@
require intltool.inc
+
+PR = "${INC_PR}.1"
+
diff --git a/recipes/intltool/intltool_0.35.0.bb b/recipes/intltool/intltool_0.35.0.bb
index 6dea51a..6da8832 100644
--- a/recipes/intltool/intltool_0.35.0.bb
+++ b/recipes/intltool/intltool_0.35.0.bb
@@ -1,8 +1,6 @@
require intltool.inc
-DEPENDS = "libxml-parser-perl-native"
#RDEPENDS = "libxml-parser-perl"
-
-PR = "r1"
-
RRECOMMENDS = "perl-modules"
+
+PR = "${INC_PR}.1"
diff --git a/recipes/intltool/intltool_0.35.2.bb b/recipes/intltool/intltool_0.35.2.bb
index 5e2f94e..a8e2cf8 100644
--- a/recipes/intltool/intltool_0.35.2.bb
+++ b/recipes/intltool/intltool_0.35.2.bb
@@ -1,8 +1,7 @@
require intltool.inc
-DEPENDS = "libxml-parser-perl-native"
RDEPENDS = "perl-module-text-wrap perl-module-re"
+RRECOMMENDS = "perl-modules"
-PR = "r1"
+PR = "${INC_PR}.1"
-RRECOMMENDS = "perl-modules"
diff --git a/recipes/intltool/intltool_0.35.5.bb b/recipes/intltool/intltool_0.35.5.bb
index 092689b..4cb7a79 100644
--- a/recipes/intltool/intltool_0.35.5.bb
+++ b/recipes/intltool/intltool_0.35.5.bb
@@ -1,12 +1,10 @@
require intltool.inc
-DEPENDS = "libxml-parser-perl-native"
RDEPENDS = "perl-module-text-wrap perl-module-re"
-
-PR = "r2"
-
RRECOMMENDS = "perl-modules"
+PR = "${INC_PR}.1"
+
DEFAULT_PREFERENCE = "-1"
SRC_URI += "file://intltool-0.35.5-polkit.patch;patch=1"
diff --git a/recipes/intltool/intltool_0.37.1.bb b/recipes/intltool/intltool_0.37.1.bb
index e482625..04bd71f 100644
--- a/recipes/intltool/intltool_0.37.1.bb
+++ b/recipes/intltool/intltool_0.37.1.bb
@@ -1 +1,4 @@
require intltool.inc
+
+PR = "${INC_PR}.1"
+
diff --git a/recipes/intltool/intltool_0.40.3.bb b/recipes/intltool/intltool_0.40.3.bb
index b4000dc..ddd6f89 100644
--- a/recipes/intltool/intltool_0.40.3.bb
+++ b/recipes/intltool/intltool_0.40.3.bb
@@ -1,6 +1,6 @@
require intltool.inc
-PR = "r2"
+PR = "${INC_PR}.1"
EXTRA_OEMAKE = "'PERL_TARGET=/usr/bin/perl'"
More information about the Openembedded-commits
mailing list