From e16c968ffb96fac3177bb885872c2b5cdde87239 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Wed, 13 Aug 2014 19:41:04 +0200 Subject: python-scons-native: Make it useable if old host install exists This was recently fixed to work on Fedora 17 if no scons is installed on the host by setting the PYTHONPATH to where BitBake has installed scons. However, if an older version of scons than 2.3.0 is installed, then it still breaks. This is due to how scons tries to determine its installation by searching through standard paths. If it finds an old installation it prepends that path to sys.path thereby causing it to ignore the PYTHONPATH. The solution is to instead set SCONS_LIB_PATH which works both if scons is not installed and if an older version is installed. Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-scons-native_2.3.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python-scons-native_2.3.2.bb b/meta/recipes-devtools/python/python-scons-native_2.3.2.bb index 067ed61a4e..dae89ab5d2 100644 --- a/meta/recipes-devtools/python/python-scons-native_2.3.2.bb +++ b/meta/recipes-devtools/python/python-scons-native_2.3.2.bb @@ -4,5 +4,5 @@ DEPENDS = "python-native" RDEPENDS_${PN} = "" do_install_append() { - create_wrapper ${D}${bindir}/scons PYTHONPATH='$PYTHONPATH:${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}' + create_wrapper ${D}${bindir}/scons SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}' } -- cgit v1.2.3