diff options
| author | Richard Purdie <richard@rex.(none)> | 2009-12-05 23:18:02 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@rex.(none)> | 2009-12-05 23:18:02 +0000 |
| commit | 288e62a22115a32effc65efa7c2d6ef2867d0b91 (patch) | |
| tree | e316e1034e26300b44f7cdfc297b73727f3242f3 /meta/classes/distutils.bbclass | |
| parent | c7d4ad8e9dce735cf52caaf38afe2392301b2536 (diff) | |
| download | openembedded-core-288e62a22115a32effc65efa7c2d6ef2867d0b91.tar.gz openembedded-core-288e62a22115a32effc65efa7c2d6ef2867d0b91.tar.bz2 openembedded-core-288e62a22115a32effc65efa7c2d6ef2867d0b91.zip | |
distutils: Sync with OE.dev
Signed-off-by: Richard Purdie <richard@rex.(none)>
Diffstat (limited to 'meta/classes/distutils.bbclass')
| -rw-r--r-- | meta/classes/distutils.bbclass | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass index 0b9bdfe1a9..245ef7d859 100644 --- a/meta/classes/distutils.bbclass +++ b/meta/classes/distutils.bbclass @@ -25,10 +25,10 @@ distutils_stage_headers() { } distutils_stage_all() { - install -d ${STAGING_DIR_HOST}${prefix}/${PYTHON_DIR}/site-packages STAGING_INCDIR=${STAGING_INCDIR} \ STAGING_LIBDIR=${STAGING_LIBDIR} \ - PYTHONPATH=${STAGING_DIR_HOST}${prefix}/${PYTHON_DIR}/site-packages \ + install -d ${STAGING_DIR_HOST}${libdir}/${PYTHON_DIR}/site-packages + PYTHONPATH=${STAGING_DIR_HOST}${libdir}/${PYTHON_DIR}/site-packages \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ oefatal "python setup.py install (stage) execution failed." @@ -60,7 +60,14 @@ distutils_do_install() { fi rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/easy-install.pth - + + # + # FIXME: Bandaid against wrong datadir computation + # + if test -e ${D}${datadir}/share; then + mv -f ${D}${datadir}/share/* ${D}${datadir}/ + fi + find ${D}${libdir}/${PYTHON_DIR}/site-packages -iname '*.pyo' -exec rm {} \; } |