From bea64f3bd904ddc02694e07551cb631ac55f4e23 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Wed, 10 Dec 2008 00:18:17 +0100 Subject: Python 2.6: here we are. WIP :) --- classes/distutils-base.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'classes') 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)}" -- cgit v1.2.3