From f5d0f6becc6d1eb3a525a9e66ffd8bba52e2ae4e Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 28 May 2013 13:13:48 +0000 Subject: 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 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] (From OE-Core rev: 1aa828d05ae1614689542c6a9ce6425a088bdc7d) Signed-off-by: Hongxu Jia Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python-scons-native_2.3.0.bb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta') 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 1e4ec27ce1..067ed61a4e 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}' +} -- cgit v1.2.3-54-g00ecf