diff options
| author |   Marcin Juszkiewicz <hrw@openedhand.com> | 2008-07-28 15:12:27 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-07-28 15:12:27 +0000 |
| commit | a1c0e2c8edc475e356e574d105cf914954e737b4 (patch) | |
| tree | 61f4b8e800544ebba667853a8a43f275b60045c4 | |
| parent | dedc6203157c2a2d9dc17d85af1bf234f4b10361 (diff) | |
| download | openembedded-core-contrib-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.bbclass | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass index 7a18e71c04d..ef761be7076 100644 --- a/meta/classes/distutils.bbclass +++ b/meta/classes/distutils.bbclass @@ -1,12 +1,16 @@ inherit distutils-base distutils_do_compile() { + STAGING_INCDIR=${STAGING_INCDIR} \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/python setup.py build || \ oefatal "python setup.py build_ext execution failed." } distutils_stage_headers() { + STAGING_INCDIR=${STAGING_INCDIR} \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ 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." @@ -14,6 +18,8 @@ distutils_stage_headers() { distutils_stage_all() { install -d ${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages + STAGING_INCDIR=${STAGING_INCDIR} \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_DIR_HOST}${layout_prefix} --install-data=${STAGING_DATADIR} || \ @@ -22,6 +28,8 @@ distutils_stage_all() { distutils_do_install() { install -d ${D}${libdir}/${PYTHON_DIR}/site-packages + STAGING_INCDIR=${STAGING_INCDIR} \ + STAGING_LIBDIR=${STAGING_LIBDIR} \ PYTHONPATH=${D}/${libdir}/${PYTHON_DIR}/site-packages \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \ |