diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2011-01-18 12:11:37 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-20 21:37:00 +0000 |
| commit | 6f31e13e81ed87319154f639d24013799fde1438 (patch) | |
| tree | 3cdbe1aca13df91af101cd3a1e928c8e87b23762 /meta/classes/distutils-common-base.bbclass | |
| parent | 943f80f2aa55b196d5881f4b639f3645a78ab648 (diff) | |
| download | openembedded-core-contrib-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-common-base.bbclass')
| -rw-r--r-- | meta/classes/distutils-common-base.bbclass | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/meta/classes/distutils-common-base.bbclass b/meta/classes/distutils-common-base.bbclass index 01bf9eaeba..f66a5cd571 100644 --- a/meta/classes/distutils-common-base.bbclass +++ b/meta/classes/distutils-common-base.bbclass @@ -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 \ " |