summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-08-20 20:55:23 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-08-20 20:55:23 +0000
commitcc67c28f0b7356cda6224810d36d557dc94cbeca (patch)
treef811a59f6895ea9e36f0d44c0d5fb47afd94f8a3
parentcd09e1bf4756dd8000a42ae21a41ae2f69da485e (diff)
parentf1e340b342ef1035865d145f0ab54afb8ace2f40 (diff)
merge of '32e6a3c5d4994942e12a0f14ff64ebd224726e17'
and 'f1d39ac0c47301d60716c311f9babd62a0c15fc2'
-rw-r--r--classes/distutils.bbclass9
-rw-r--r--packages/python/python-efl.inc2
-rw-r--r--packages/python/python-evas_cvs.bb8
3 files changed, 10 insertions, 9 deletions
diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass
index d23c2a3b2e..9f699bc7f0 100644
--- a/classes/distutils.bbclass
+++ b/classes/distutils.bbclass
@@ -9,7 +9,14 @@ distutils_do_compile() {
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 execution failed."
+ oefatal "python setup.py install_headers execution failed."
+}
+
+distutils_stage_all() {
+ 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() {
diff --git a/packages/python/python-efl.inc b/packages/python/python-efl.inc
index 875a88f5b2..aa12b979f8 100644
--- a/packages/python/python-efl.inc
+++ b/packages/python/python-efl.inc
@@ -3,7 +3,7 @@ LICENSE = "BSD"
AUTHOR = "Gustavo Sverzut Barbieri <barbieri@gmail.com>"
HOMEPAGE = "http://www.enlightenment.org"
DEPENDS = "python-pyrex-native python-numeric"
-PV = "0.0.0+cvs${SRCDATE}"
+PV = "0.1.1+cvs${SRCDATE}"
inherit distutils
diff --git a/packages/python/python-evas_cvs.bb b/packages/python/python-evas_cvs.bb
index 78f306c060..710b626349 100644
--- a/packages/python/python-evas_cvs.bb
+++ b/packages/python/python-evas_cvs.bb
@@ -3,11 +3,5 @@ require python-efl.inc
DEPENDS += "evas"
do_stage() {
- distutils_stage_headers
+ distutils_stage_all
}
-
-#do_stage_append() {
-# install -d ${STAGING_DIR}/${BUILD_SYS}/include/${PYTHON_DIR}/python-evas/
-# install -m 0644 evas/evas.c_evas.pxd ${STAGING_DIR}/${BUILD_SYS}/include/${PYTHON_DIR}/python-evas/
-#}
-