diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-07-24 01:04:50 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-07-24 01:04:50 +0000 |
| commit | 697093f6bc5ab5d3941cfa68fea21a2ba56def85 (patch) | |
| tree | aa0749e76fc6c7cc4de6c8e04eeb9115fb7dfa3c | |
| parent | 01e5df85fa48d7e674debccd58911a2a4b837076 (diff) | |
distutils: set PYTHONPATH and always create the site-packages directory to improve compatibility with certain extension packages
| -rw-r--r-- | classes/distutils-base.bbclass | 5 | ||||
| -rw-r--r-- | classes/distutils.bbclass | 14 |
2 files changed, 11 insertions, 8 deletions
diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass index a66d845858..c3f325768d 100644 --- a/classes/distutils-base.bbclass +++ b/classes/distutils-base.bbclass @@ -12,6 +12,7 @@ def python_dir(d): 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" diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass index db15cebdd7..a7efad2e63 100644 --- a/classes/distutils.bbclass +++ b/classes/distutils.bbclass @@ -1,15 +1,17 @@ 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 |