summaryrefslogtreecommitdiffstats
path: root/meta/classes/distutils.bbclass
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-01-18 12:11:37 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-20 21:37:00 +0000
commit6f31e13e81ed87319154f639d24013799fde1438 (patch)
tree3cdbe1aca13df91af101cd3a1e928c8e87b23762 /meta/classes/distutils.bbclass
parent943f80f2aa55b196d5881f4b639f3645a78ab648 (diff)
downloadpoky-6f31e13e81ed87319154f639d24013799fde1438.tar.gz
distutils(-common-base) bbclass: sync with OE
When using python recipes imported from OE (e.g. python-cheetah) parsing only succeeds when python has already been built due to the PYTHON_DIR references. This commit syncs the classes with OE to make it work, but keeps the *.pyo removal from yocto. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes/distutils.bbclass')
-rw-r--r--meta/classes/distutils.bbclass20
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index 245ef7d859..7e6fbc0c06 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -16,9 +16,7 @@ distutils_do_compile() {
16} 16}
17 17
18distutils_stage_headers() { 18distutils_stage_headers() {
19 install -d ${STAGING_DIR_HOST}${libdir}/${PYTHON_DIR}/site-packages 19 install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
20 STAGING_INCDIR=${STAGING_INCDIR} \
21 STAGING_LIBDIR=${STAGING_LIBDIR} \
22 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 20 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
23 ${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ 21 ${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
24 oefatal "python setup.py install_headers execution failed." 22 oefatal "python setup.py install_headers execution failed."
@@ -27,18 +25,18 @@ distutils_stage_headers() {
27distutils_stage_all() { 25distutils_stage_all() {
28 STAGING_INCDIR=${STAGING_INCDIR} \ 26 STAGING_INCDIR=${STAGING_INCDIR} \
29 STAGING_LIBDIR=${STAGING_LIBDIR} \ 27 STAGING_LIBDIR=${STAGING_LIBDIR} \
30 install -d ${STAGING_DIR_HOST}${libdir}/${PYTHON_DIR}/site-packages 28 install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
31 PYTHONPATH=${STAGING_DIR_HOST}${libdir}/${PYTHON_DIR}/site-packages \ 29 PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
32 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 30 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
33 ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ 31 ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
34 oefatal "python setup.py install (stage) execution failed." 32 oefatal "python setup.py install (stage) execution failed."
35} 33}
36 34
37distutils_do_install() { 35distutils_do_install() {
38 install -d ${D}${libdir}/${PYTHON_DIR}/site-packages 36 install -d ${D}${PYTHON_SITEPACKAGES_DIR}
39 STAGING_INCDIR=${STAGING_INCDIR} \ 37 STAGING_INCDIR=${STAGING_INCDIR} \
40 STAGING_LIBDIR=${STAGING_LIBDIR} \ 38 STAGING_LIBDIR=${STAGING_LIBDIR} \
41 PYTHONPATH=${D}/${libdir}/${PYTHON_DIR}/site-packages \ 39 PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \
42 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 40 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
43 ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_INSTALL_ARGS} || \ 41 ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_INSTALL_ARGS} || \
44 oefatal "python setup.py install execution failed." 42 oefatal "python setup.py install execution failed."
@@ -59,15 +57,17 @@ distutils_do_install() {
59 done 57 done
60 fi 58 fi
61 59
62 rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/easy-install.pth 60 rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth
63 61
64 # 62 #
65 # FIXME: Bandaid against wrong datadir computation 63 # FIXME: Bandaid against wrong datadir computation
66 # 64 #
67 if test -e ${D}${datadir}/share; then 65 if test -e ${D}${datadir}/share; then
68 mv -f ${D}${datadir}/share/* ${D}${datadir}/ 66 mv -f ${D}${datadir}/share/* ${D}${datadir}/
69 fi 67 fi
70 68
69 # These are generated files, on really slow systems the storage/speed trade off
70 # might be worth it, but in general it isn't
71 find ${D}${libdir}/${PYTHON_DIR}/site-packages -iname '*.pyo' -exec rm {} \; 71 find ${D}${libdir}/${PYTHON_DIR}/site-packages -iname '*.pyo' -exec rm {} \;
72} 72}
73 73