mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 00:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

classes/distutils*.bbclass: Merge updates from OE

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2645 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2007-09-02 09:46:59 +00:00
parent 5781fe13d6
commit 733dc27ecf
2 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta/classes/distutils-base.bbclass
View File

@@ -5,14 +5,14 @@ RDEPENDS += "python-core"
def python_dir(d): def python_dir(d):
import os, bb import os, bb
staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 ) staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3"
if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4"
if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5" if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5"
if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4"
if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3"
raise "No Python in STAGING_INCDIR. Forgot to build python-native ?" raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
PYTHON_DIR = "${@python_dir(d)}" PYTHON_DIR = "${@python_dir(d)}"
FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*" FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
FILES_${PN}-dbg = "${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 \
${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug" ${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug"

46
meta/classes/distutils.bbclass
View File

@@ -1,15 +1,49 @@
inherit distutils-base inherit distutils-base
distutils_do_compile() { distutils_do_compile() {
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
${STAGING_BINDIR_NATIVE}/python setup.py build || \ ${STAGING_BINDIR_NATIVE}/python setup.py build || \
oefatal "python setup.py build execution failed." oefatal "python setup.py build_ext execution failed."
}
distutils_stage_headers() {
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
${STAGING_BINDIR_NATIVE}/python setup.py install_headers --install-dir=${STAGING_INCDIR}/${PYTHON_DIR} || \
oefatal "python setup.py install_headers execution failed."
}
distutils_stage_all() {
install -d ${STAGING_INCDIR}/../${PYTHON_DIR}/site-packages
PYTHONPATH=${STAGING_INCDIR}/../${PYTHON_DIR}/site-packages \
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_INCDIR}/.. --install-data=${STAGING_INCDIR}/../share || \
oefatal "python setup.py install (stage) execution failed."
} }
distutils_do_install() { distutils_do_install() {
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ install -d ${D}${libdir}/${PYTHON_DIR}/site-packages
${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \ PYTHONPATH=${D}/${libdir}/${PYTHON_DIR}/site-packages \
oefatal "python setup.py install execution failed." 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
done
if test -e ${D}${bindir} ; then
for i in ${D}${bindir}/* ; do \
sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
done
fi
if test -e ${D}${sbindir} ; then
for i in ${D}${sbindir}/* ; do \
sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
done
fi
rm -f ${D}${libdir}/${PYTHON_DIR}/site-packages/easy-install.pth
} }
EXPORT_FUNCTIONS do_compile do_install EXPORT_FUNCTIONS do_compile do_install