diff options
Diffstat (limited to 'meta/classes/distutils3.bbclass')
| -rw-r--r-- | meta/classes/distutils3.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass index 443bf3ac4b..4f6ca44822 100644 --- a/meta/classes/distutils3.bbclass +++ b/meta/classes/distutils3.bbclass | |||
| @@ -19,7 +19,7 @@ distutils3_do_compile() { | |||
| 19 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \ | 19 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \ |
| 20 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ | 20 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ |
| 21 | build ${DISTUTILS_BUILD_ARGS} || \ | 21 | build ${DISTUTILS_BUILD_ARGS} || \ |
| 22 | bbfatal "${PYTHON_PN} setup.py build_ext execution failed." | 22 | bbfatal_log "${PYTHON_PN} setup.py build_ext execution failed." |
| 23 | } | 23 | } |
| 24 | distutils3_do_compile[vardepsexclude] = "MACHINE" | 24 | distutils3_do_compile[vardepsexclude] = "MACHINE" |
| 25 | 25 | ||
| @@ -32,7 +32,7 @@ distutils3_stage_headers() { | |||
| 32 | fi | 32 | fi |
| 33 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \ | 33 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \ |
| 34 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ | 34 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ |
| 35 | bbfatal "${PYTHON_PN} setup.py install_headers execution failed." | 35 | bbfatal_log "${PYTHON_PN} setup.py install_headers execution failed." |
| 36 | } | 36 | } |
| 37 | distutils3_stage_headers[vardepsexclude] = "MACHINE" | 37 | distutils3_stage_headers[vardepsexclude] = "MACHINE" |
| 38 | 38 | ||
| @@ -48,7 +48,7 @@ distutils3_stage_all() { | |||
| 48 | PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \ | 48 | PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \ |
| 49 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \ | 49 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \ |
| 50 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ | 50 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ |
| 51 | bbfatal "${PYTHON_PN} setup.py install (stage) execution failed." | 51 | bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed." |
| 52 | } | 52 | } |
| 53 | distutils3_stage_all[vardepsexclude] = "MACHINE" | 53 | distutils3_stage_all[vardepsexclude] = "MACHINE" |
| 54 | 54 | ||
| @@ -64,7 +64,7 @@ distutils3_do_install() { | |||
| 64 | PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \ | 64 | PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \ |
| 65 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \ | 65 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \ |
| 66 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \ | 66 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \ |
| 67 | bbfatal "${PYTHON_PN} setup.py install execution failed." | 67 | bbfatal_log "${PYTHON_PN} setup.py install execution failed." |
| 68 | 68 | ||
| 69 | # support filenames with *spaces* | 69 | # support filenames with *spaces* |
| 70 | find ${D} -name "*.py" -exec grep -q ${D} {} \; -exec sed -i -e s:${D}::g {} \; | 70 | find ${D} -name "*.py" -exec grep -q ${D} {} \; -exec sed -i -e s:${D}::g {} \; |
