[oe-commits] Hongxu Jia : python-scons-native: fix invoking scons failed on Fedora-17

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 1aa828d05ae1614689542c6a9ce6425a088bdc7d
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=1aa828d05ae1614689542c6a9ce6425a088bdc7d

Author: Hongxu Jia <hongxu.jia at windriver.com>
Date:   Tue May 28 13:13:48 2013 +0000

python-scons-native: fix invoking scons failed on Fedora-17

While the destro didn't install scons, build scons by python-scons-native,
and invoke it with the error:
...
$scons -h
Traceback (most recent call last):
  File "/buildarea2/hongxujia/build-20130520-udev-emenlow/tmp/sysroots/x86_64-linux/usr/bin/scons", line 188, in <module>
    import SCons.Script
ImportError: No module named SCons.Script
...

1, While building scons as default, scons's lib will be install in the dir of
`scons' or `scons-2.3.0' if the option `--install-lib' is not set explicitly.

2, While build python-scons-native, `--install-lib' is explicitly set, and
scons's lib was not installed in the dir of `scons' or `scons-2.3.0'.

3, While invoke scons-native, the scons searches the lib in ${STAGING_DIR_HOST}/
${PYTHON_SITEPACKAGES_DIR}/scons, ${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}/
scons-2.3.0 rather than ${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}.

Use create_wrapper to relocate scons-native to add `${STAGING_DIR_HOST}/${PYTHON
_SITEPACKAGES_DIR}' to PYTHONPATH, so scons-native could find out the lib.

[YOCTO #4562]

Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../python/python-scons-native_2.3.0.bb            |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-devtools/python/python-scons-native_2.3.0.bb b/meta/recipes-devtools/python/python-scons-native_2.3.0.bb
index 1e4ec27..067ed61 100644
--- a/meta/recipes-devtools/python/python-scons-native_2.3.0.bb
+++ b/meta/recipes-devtools/python/python-scons-native_2.3.0.bb
@@ -2,3 +2,7 @@ require python-scons_${PV}.bb
 inherit native pythonnative
 DEPENDS = "python-native"
 RDEPENDS_${PN} = ""
+
+do_install_append() {
+    create_wrapper ${D}${bindir}/scons  PYTHONPATH='$PYTHONPATH:${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}'
+}