summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorMichael 'Mickey' Lauer <mickey@vanille-media.de>2008-12-10 00:18:17 +0100
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>2008-12-10 00:20:00 +0100
commit1de9ccb8a2254454756c391df8e7ed1d29383d0a (patch)
treea6db1c1c57e126aac5ae9028ff58392f2172c96b /classes
parent358927bd781103e39fec21c853fb67738ec3f7c1 (diff)
Python 2.6: here we are. WIP :)
Diffstat (limited to 'classes')
-rw-r--r--classes/distutils-base.bbclass5
1 files changed, 2 insertions, 3 deletions
diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass
index 70155619b3..a08414aadf 100644
--- a/classes/distutils-base.bbclass
+++ b/classes/distutils-base.bbclass
@@ -8,9 +8,8 @@ export STAGING_LIBDIR
def python_dir(d):
import os, bb
staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
- if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5"
- if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4"
- if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3"
+ for majmin in "2.6 2.5 2.4 2.3".split():
+ if os.path.exists( "%s/python%s" % ( staging_incdir, majmin ) ): return "python%s" % majmin
raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
PYTHON_DIR = "${@python_dir(d)}"