summaryrefslogtreecommitdiffstats
path: root/meta/classes/distutils-common-base.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-common-base.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-common-base.bbclass')
-rw-r--r--meta/classes/distutils-common-base.bbclass23
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 @@
1inherit python-dir
2
1EXTRA_OEMAKE = "" 3EXTRA_OEMAKE = ""
2 4
3export STAGING_INCDIR 5export STAGING_INCDIR
4export STAGING_LIBDIR 6export STAGING_LIBDIR
5 7
6def python_dir(d):
7 import os, bb
8 staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
9 for majmin in "2.6 2.5 2.4 2.3".split():
10 if os.path.exists( "%s/python%s" % ( staging_incdir, majmin ) ): return "python%s" % majmin
11 if not "python-native" in bb.data.getVar( "DEPENDS", d, 1 ).split():
12 raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
13 return "INVALID"
14
15PYTHON_DIR = "${@python_dir(d)}"
16
17PACKAGES = "${PN}-dev ${PN}-dbg ${PN}-doc ${PN}" 8PACKAGES = "${PN}-dev ${PN}-dbg ${PN}-doc ${PN}"
18 9
19FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*" 10FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
@@ -21,10 +12,10 @@ FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
21FILES_${PN}-dev += "\ 12FILES_${PN}-dev += "\
22 ${datadir}/pkgconfig \ 13 ${datadir}/pkgconfig \
23 ${libdir}/pkgconfig \ 14 ${libdir}/pkgconfig \
24 ${libdir}/${PYTHON_DIR}/site-packages/*.la \ 15 ${PYTHON_SITEPACKAGES_DIR}/*.la \
25" 16"
26FILES_${PN}-dbg = "\ 17FILES_${PN}-dbg += "\
27 ${libdir}/${PYTHON_DIR}/site-packages/.debug \ 18 ${PYTHON_SITEPACKAGES_DIR}/.debug \
28 ${libdir}/${PYTHON_DIR}/site-packages/*/.debug \ 19 ${PYTHON_SITEPACKAGES_DIR}/*/.debug \
29 ${libdir}/${PYTHON_DIR}/site-packages/*/*/.debug \ 20 ${PYTHON_SITEPACKAGES_DIR}/*/*/.debug \
30" 21"