[oe-commits] org.oe.dev distutils: set PYTHONPATH and always create the site-packages directory to improve compatibility with certain extension packages

[mickeyl commit]

distutils: set PYTHONPATH and always create the site-packages directory to improve compatibility with certain extension packages

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 421f158b0fcce5214161fc31e52209dc5dfcad7b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=421f158b0fcce5214161fc31e52209dc5dfcad7b
Files:
1
classes/distutils-base.bbclass
classes/distutils.bbclass
Diffs:

#
# mt diff -r6cf764da09e48d40d95beec522eef53ed24fcb83 -r421f158b0fcce5214161fc31e52209dc5dfcad7b
#
# 
# 
# patch "classes/distutils-base.bbclass"
#  from [f35c9647052b9f8a19f0c3d2cbcf7b1b8523d810]
#    to [91fb202ad3d377913b0616f94e38e0cc7e8c7804]
# 
# patch "classes/distutils.bbclass"
#  from [4ffee91258344c002afdeb8f9d4cac10e450d830]
#    to [74db81e2aa502dafb151fa988241ef6d241a4e7c]
# 
============================================================
--- classes/distutils-base.bbclass	f35c9647052b9f8a19f0c3d2cbcf7b1b8523d810
+++ classes/distutils-base.bbclass	91fb202ad3d377913b0616f94e38e0cc7e8c7804
@@ -12,6 +12,7 @@ FILES_${PN} = "${bindir}/* ${libdir}/* $
 
 PYTHON_DIR = "${@python_dir(d)}"
 FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
-FILES_${PN}-dbg = "${libdir}/${PYTHON_DIR}/site-packages/*/.debug \
-                   ${libdir}/${PYTHON_DIR}/site-packages/.debug"
+FILES_${PN}-dbg = "${libdir}/${PYTHON_DIR}/site-packages/.debug \
+                   ${libdir}/${PYTHON_DIR}/site-packages/./*/debug \
+                   ${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug"
 
============================================================
--- classes/distutils.bbclass	4ffee91258344c002afdeb8f9d4cac10e450d830
+++ classes/distutils.bbclass	74db81e2aa502dafb151fa988241ef6d241a4e7c
@@ -1,15 +1,17 @@ distutils_do_compile() {
 inherit distutils-base
 
 distutils_do_compile() {
-	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-	${STAGING_BINDIR_NATIVE}/python setup.py build || \
-	oefatal "python setup.py build execution failed."
+         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+         ${STAGING_BINDIR_NATIVE}/python setup.py build || \
+         oefatal "python setup.py build execution failed."
 }
 
 distutils_do_install() {
-	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-	${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \
-	oefatal "python setup.py install execution failed."
+        install -d ${D}${libdir}/${PYTHON_DIR}/site-packages
+        PYTHONPATH=${D}/${libdir}/${PYTHON_DIR}/site-packages \
+        BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+        ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \
+        oefatal "python setup.py install execution failed."
 
         for i in `find ${D} -name "*.py"` ; do \
             sed -i -e s:${D}::g $i