diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2014-08-13 19:41:04 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-15 18:21:48 +0100 |
commit | c742a6a7fb316fddc312e7ee6427f2860eb36d88 (patch) | |
tree | c95d9afd3efd6300d82f9d38871c9f3525684e9f | |
parent | f1cdd6e48ffd9f74feefae10ebceb2198673df89 (diff) | |
download | poky-c742a6a7fb316fddc312e7ee6427f2860eb36d88.tar.gz |
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.
(From OE-Core rev: e16c968ffb96fac3177bb885872c2b5cdde87239)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/python/python-scons-native_2.3.2.bb | 2 |
1 files changed, 1 insertions, 1 deletions
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" | |||
4 | RDEPENDS_${PN} = "" | 4 | RDEPENDS_${PN} = "" |
5 | 5 | ||
6 | do_install_append() { | 6 | do_install_append() { |
7 | create_wrapper ${D}${bindir}/scons PYTHONPATH='$PYTHONPATH:${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}' | 7 | create_wrapper ${D}${bindir}/scons SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}' |
8 | } | 8 | } |