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>
This commit is contained in:
parent
943f80f2aa
commit
6f31e13e81
|
@ -1,19 +1,10 @@
|
|||
inherit python-dir
|
||||
|
||||
EXTRA_OEMAKE = ""
|
||||
|
||||
export STAGING_INCDIR
|
||||
export STAGING_LIBDIR
|
||||
|
||||
def python_dir(d):
|
||||
import os, bb
|
||||
staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
|
||||
for majmin in "2.6 2.5 2.4 2.3".split():
|
||||
if os.path.exists( "%s/python%s" % ( staging_incdir, majmin ) ): return "python%s" % majmin
|
||||
if not "python-native" in bb.data.getVar( "DEPENDS", d, 1 ).split():
|
||||
raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
|
||||
return "INVALID"
|
||||
|
||||
PYTHON_DIR = "${@python_dir(d)}"
|
||||
|
||||
PACKAGES = "${PN}-dev ${PN}-dbg ${PN}-doc ${PN}"
|
||||
|
||||
FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
|
||||
|
@ -21,10 +12,10 @@ FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
|
|||
FILES_${PN}-dev += "\
|
||||
${datadir}/pkgconfig \
|
||||
${libdir}/pkgconfig \
|
||||
${libdir}/${PYTHON_DIR}/site-packages/*.la \
|
||||
${PYTHON_SITEPACKAGES_DIR}/*.la \
|
||||
"
|
||||
FILES_${PN}-dbg = "\
|
||||
${libdir}/${PYTHON_DIR}/site-packages/.debug \
|
||||
${libdir}/${PYTHON_DIR}/site-packages/*/.debug \
|
||||
${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug \
|
||||
FILES_${PN}-dbg += "\
|
||||
${PYTHON_SITEPACKAGES_DIR}/.debug \
|
||||
${PYTHON_SITEPACKAGES_DIR}/*/.debug \
|
||||
${PYTHON_SITEPACKAGES_DIR}/*/*/.debug \
|
||||
"
|
||||
|
|
|
@ -16,9 +16,7 @@ distutils_do_compile() {
|
|||
}
|
||||
|
||||
distutils_stage_headers() {
|
||||
install -d ${STAGING_DIR_HOST}${libdir}/${PYTHON_DIR}/site-packages
|
||||
STAGING_INCDIR=${STAGING_INCDIR} \
|
||||
STAGING_LIBDIR=${STAGING_LIBDIR} \
|
||||
install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
|
||||
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
|
||||
${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
|
||||
oefatal "python setup.py install_headers execution failed."
|
||||
|
@ -27,18 +25,18 @@ distutils_stage_headers() {
|
|||
distutils_stage_all() {
|
||||
STAGING_INCDIR=${STAGING_INCDIR} \
|
||||
STAGING_LIBDIR=${STAGING_LIBDIR} \
|
||||
install -d ${STAGING_DIR_HOST}${libdir}/${PYTHON_DIR}/site-packages
|
||||
PYTHONPATH=${STAGING_DIR_HOST}${libdir}/${PYTHON_DIR}/site-packages \
|
||||
install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
|
||||
PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
|
||||
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."
|
||||
}
|
||||
|
||||
distutils_do_install() {
|
||||
install -d ${D}${libdir}/${PYTHON_DIR}/site-packages
|
||||
install -d ${D}${PYTHON_SITEPACKAGES_DIR}
|
||||
STAGING_INCDIR=${STAGING_INCDIR} \
|
||||
STAGING_LIBDIR=${STAGING_LIBDIR} \
|
||||
PYTHONPATH=${D}/${libdir}/${PYTHON_DIR}/site-packages \
|
||||
PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \
|
||||
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
|
||||
${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_INSTALL_ARGS} || \
|
||||
oefatal "python setup.py install execution failed."
|
||||
|
@ -59,15 +57,17 @@ distutils_do_install() {
|
|||
done
|
||||
fi
|
||||
|
||||
rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/easy-install.pth
|
||||
|
||||
rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth
|
||||
|
||||
#
|
||||
# FIXME: Bandaid against wrong datadir computation
|
||||
#
|
||||
if test -e ${D}${datadir}/share; then
|
||||
mv -f ${D}${datadir}/share/* ${D}${datadir}/
|
||||
fi
|
||||
|
||||
|
||||
# These are generated files, on really slow systems the storage/speed trade off
|
||||
# might be worth it, but in general it isn't
|
||||
find ${D}${libdir}/${PYTHON_DIR}/site-packages -iname '*.pyo' -exec rm {} \;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue