summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-07-28 15:12:27 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-07-28 15:12:27 +0000
commita1c0e2c8edc475e356e574d105cf914954e737b4 (patch)
tree61f4b8e800544ebba667853a8a43f275b60045c4
parentdedc6203157c2a2d9dc17d85af1bf234f4b10361 (diff)
downloadpoky-a1c0e2c8edc475e356e574d105cf914954e737b4.tar.gz
distutils.bbclass: fix build with new layout of staging
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4967 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/classes/distutils.bbclass8
1 files changed, 8 insertions, 0 deletions
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index 7a18e71c04..ef761be707 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -1,12 +1,16 @@
1inherit distutils-base 1inherit distutils-base
2 2
3distutils_do_compile() { 3distutils_do_compile() {
4 STAGING_INCDIR=${STAGING_INCDIR} \
5 STAGING_LIBDIR=${STAGING_LIBDIR} \
4 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 6 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
5 ${STAGING_BINDIR_NATIVE}/python setup.py build || \ 7 ${STAGING_BINDIR_NATIVE}/python setup.py build || \
6 oefatal "python setup.py build_ext execution failed." 8 oefatal "python setup.py build_ext execution failed."
7} 9}
8 10
9distutils_stage_headers() { 11distutils_stage_headers() {
12 STAGING_INCDIR=${STAGING_INCDIR} \
13 STAGING_LIBDIR=${STAGING_LIBDIR} \
10 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 14 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
11 ${STAGING_BINDIR_NATIVE}/python setup.py install_headers --install-dir=${STAGING_INCDIR}/${PYTHON_DIR} || \ 15 ${STAGING_BINDIR_NATIVE}/python setup.py install_headers --install-dir=${STAGING_INCDIR}/${PYTHON_DIR} || \
12 oefatal "python setup.py install_headers execution failed." 16 oefatal "python setup.py install_headers execution failed."
@@ -14,6 +18,8 @@ distutils_stage_headers() {
14 18
15distutils_stage_all() { 19distutils_stage_all() {
16 install -d ${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages 20 install -d ${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages
21 STAGING_INCDIR=${STAGING_INCDIR} \
22 STAGING_LIBDIR=${STAGING_LIBDIR} \
17 PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \ 23 PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \
18 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 24 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
19 ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_DIR_HOST}${layout_prefix} --install-data=${STAGING_DATADIR} || \ 25 ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_DIR_HOST}${layout_prefix} --install-data=${STAGING_DATADIR} || \
@@ -22,6 +28,8 @@ distutils_stage_all() {
22 28
23distutils_do_install() { 29distutils_do_install() {
24 install -d ${D}${libdir}/${PYTHON_DIR}/site-packages 30 install -d ${D}${libdir}/${PYTHON_DIR}/site-packages
31 STAGING_INCDIR=${STAGING_INCDIR} \
32 STAGING_LIBDIR=${STAGING_LIBDIR} \
25 PYTHONPATH=${D}/${libdir}/${PYTHON_DIR}/site-packages \ 33 PYTHONPATH=${D}/${libdir}/${PYTHON_DIR}/site-packages \
26 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 34 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
27 ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \ 35 ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \