[PATCH 0/1] Fix for running scons with old host installation present

[PATCH 0/1] Fix for running scons with old host installation present

[Peter Kjellerstedt]

This makes scons useable if there is an older version than 2.3.0
installed on the host.

//Peter

The following changes since commit 6882d2d9993c8655a292c93e84ea01b4738a700d:

  yocto-project-qs, ref-manual: Added 'socat' package to essentials. (2014-08-12 13:50:32 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib pkj/scons
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=pkj/scons

Peter Kjellerstedt (1):
  python-scons-native: Make it useable if old host install exists

 meta/recipes-devtools/python/python-scons-native_2.3.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
1.9.0

[PATCH 1/1] python-scons-native: Make it useable if old host install exists

[Peter Kjellerstedt]

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 <peter.kjellerstedt@axis.com>
---
 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 067ed61..dae89ab 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}'
 }
-- 
1.9.0