[oe-commits] Chris Larson : python: only dep on tk if tk is in DISTRO_FEATURES.

git version control git at git.openembedded.org
Tue Dec 22 09:50:14 UTC 2009


Module: openembedded.git
Branch: martin_jansa/xorg-7.5
Commit: a7c752d20f6a2623470734a0054e078aea4400b4
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a7c752d20f6a2623470734a0054e078aea4400b4

Author: Chris Larson <clarson at mvista.com>
Date:   Thu Dec 17 09:49:18 2009 -0700

python: only dep on tk if tk is in DISTRO_FEATURES.

Signed-off-by: Chris Larson <clarson at mvista.com>

---

 recipes/python/python_2.6.1.bb |    3 ++-
 recipes/python/python_2.6.2.bb |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes/python/python_2.6.1.bb b/recipes/python/python_2.6.1.bb
index 0a6a253..cc73dd7 100644
--- a/recipes/python/python_2.6.1.bb
+++ b/recipes/python/python_2.6.1.bb
@@ -1,5 +1,6 @@
 require python.inc
-DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib"
+DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl zlib\
+           ${@base_contains('DISTRO_FEATURES', 'tk', 'tk', '', d)}"
 DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
 PR = "${INC_PR}.0"
 
diff --git a/recipes/python/python_2.6.2.bb b/recipes/python/python_2.6.2.bb
index c367ce8..2369a4b 100644
--- a/recipes/python/python_2.6.2.bb
+++ b/recipes/python/python_2.6.2.bb
@@ -1,5 +1,6 @@
 require python.inc
-DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib"
+DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl zlib\
+           ${@base_contains('DISTRO_FEATURES', 'tk', 'tk', '', d)}"
 DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
 # set to .0 on every increase of INC_PR
 PR = "${INC_PR}.0"





More information about the Openembedded-commits mailing list