diff options
| -rw-r--r-- | meta/classes/distutils-tools.bbclass | 8 | ||||
| -rw-r--r-- | meta/classes/distutils.bbclass | 8 | ||||
| -rw-r--r-- | meta/classes/distutils3.bbclass | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/meta/classes/distutils-tools.bbclass b/meta/classes/distutils-tools.bbclass index f43450e56f..8d9b3f78f7 100644 --- a/meta/classes/distutils-tools.bbclass +++ b/meta/classes/distutils-tools.bbclass @@ -10,14 +10,14 @@ distutils_do_compile() { STAGING_LIBDIR=${STAGING_LIBDIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py build ${DISTUTILS_BUILD_ARGS} || \ - bbfatal "${PYTHON_PN} setup.py build_ext execution failed." + bbfatal_log "${PYTHON_PN} setup.py build_ext execution failed." } distutils_stage_headers() { install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ - bbfatal "${PYTHON_PN} setup.py install_headers execution failed." + bbfatal_log "${PYTHON_PN} setup.py install_headers execution failed." } distutils_stage_all() { @@ -27,7 +27,7 @@ distutils_stage_all() { PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ - bbfatal "${PYTHON_PN} setup.py install (stage) execution failed." + bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed." } distutils_do_install() { @@ -39,7 +39,7 @@ distutils_do_install() { PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \ - bbfatal "${PYTHON_PN} setup.py install execution failed." + bbfatal_log "${PYTHON_PN} setup.py install execution failed." echo "Step 3 of ${PN} Install ..." # support filenames with *spaces* diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass index cd06713882..da48a2ed5e 100644 --- a/meta/classes/distutils.bbclass +++ b/meta/classes/distutils.bbclass @@ -12,14 +12,14 @@ distutils_do_compile() { STAGING_LIBDIR=${STAGING_LIBDIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py build ${DISTUTILS_BUILD_ARGS} || \ - bbfatal "${PYTHON_PN} setup.py build execution failed." + bbfatal_log "${PYTHON_PN} setup.py build execution failed." } distutils_stage_headers() { install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ - bbfatal "${PYTHON_PN} setup.py install_headers execution failed." + bbfatal_log "${PYTHON_PN} setup.py install_headers execution failed." } distutils_stage_all() { @@ -29,7 +29,7 @@ distutils_stage_all() { PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ - bbfatal "${PYTHON_PN} setup.py install (stage) execution failed." + bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed." } distutils_do_install() { @@ -39,7 +39,7 @@ distutils_do_install() { PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \ - bbfatal "${PYTHON_PN} setup.py install execution failed." + bbfatal_log "${PYTHON_PN} setup.py install execution failed." # support filenames with *spaces* # only modify file if it contains path and recompile it 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() { BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \ ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ build ${DISTUTILS_BUILD_ARGS} || \ - bbfatal "${PYTHON_PN} setup.py build_ext execution failed." + bbfatal_log "${PYTHON_PN} setup.py build_ext execution failed." } distutils3_do_compile[vardepsexclude] = "MACHINE" @@ -32,7 +32,7 @@ distutils3_stage_headers() { fi BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \ ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ - bbfatal "${PYTHON_PN} setup.py install_headers execution failed." + bbfatal_log "${PYTHON_PN} setup.py install_headers execution failed." } distutils3_stage_headers[vardepsexclude] = "MACHINE" @@ -48,7 +48,7 @@ distutils3_stage_all() { PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \ ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ - bbfatal "${PYTHON_PN} setup.py install (stage) execution failed." + bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed." } distutils3_stage_all[vardepsexclude] = "MACHINE" @@ -64,7 +64,7 @@ distutils3_do_install() { PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \ ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \ - bbfatal "${PYTHON_PN} setup.py install execution failed." + bbfatal_log "${PYTHON_PN} setup.py install execution failed." # support filenames with *spaces* find ${D} -name "*.py" -exec grep -q ${D} {} \; -exec sed -i -e s:${D}::g {} \; |