summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/distutils-tools.bbclass8
-rw-r--r--meta/classes/distutils.bbclass8
-rw-r--r--meta/classes/distutils3.bbclass8
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() {
10 STAGING_LIBDIR=${STAGING_LIBDIR} \ 10 STAGING_LIBDIR=${STAGING_LIBDIR} \
11 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 11 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
12 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py build ${DISTUTILS_BUILD_ARGS} || \ 12 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py build ${DISTUTILS_BUILD_ARGS} || \
13 bbfatal "${PYTHON_PN} setup.py build_ext execution failed." 13 bbfatal_log "${PYTHON_PN} setup.py build_ext execution failed."
14} 14}
15 15
16distutils_stage_headers() { 16distutils_stage_headers() {
17 install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} 17 install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
18 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 18 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
19 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ 19 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
20 bbfatal "${PYTHON_PN} setup.py install_headers execution failed." 20 bbfatal_log "${PYTHON_PN} setup.py install_headers execution failed."
21} 21}
22 22
23distutils_stage_all() { 23distutils_stage_all() {
@@ -27,7 +27,7 @@ distutils_stage_all() {
27 PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \ 27 PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
28 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 28 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
29 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ 29 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
30 bbfatal "${PYTHON_PN} setup.py install (stage) execution failed." 30 bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed."
31} 31}
32 32
33distutils_do_install() { 33distutils_do_install() {
@@ -39,7 +39,7 @@ distutils_do_install() {
39 PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \ 39 PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \
40 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 40 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
41 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \ 41 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \
42 bbfatal "${PYTHON_PN} setup.py install execution failed." 42 bbfatal_log "${PYTHON_PN} setup.py install execution failed."
43 43
44 echo "Step 3 of ${PN} Install ..." 44 echo "Step 3 of ${PN} Install ..."
45 # support filenames with *spaces* 45 # 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() {
12 STAGING_LIBDIR=${STAGING_LIBDIR} \ 12 STAGING_LIBDIR=${STAGING_LIBDIR} \
13 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 13 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
14 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py build ${DISTUTILS_BUILD_ARGS} || \ 14 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py build ${DISTUTILS_BUILD_ARGS} || \
15 bbfatal "${PYTHON_PN} setup.py build execution failed." 15 bbfatal_log "${PYTHON_PN} setup.py build execution failed."
16} 16}
17 17
18distutils_stage_headers() { 18distutils_stage_headers() {
19 install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} 19 install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
20 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 20 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
21 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ 21 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
22 bbfatal "${PYTHON_PN} setup.py install_headers execution failed." 22 bbfatal_log "${PYTHON_PN} setup.py install_headers execution failed."
23} 23}
24 24
25distutils_stage_all() { 25distutils_stage_all() {
@@ -29,7 +29,7 @@ distutils_stage_all() {
29 PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \ 29 PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
30 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 30 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
31 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ 31 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
32 bbfatal "${PYTHON_PN} setup.py install (stage) execution failed." 32 bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed."
33} 33}
34 34
35distutils_do_install() { 35distutils_do_install() {
@@ -39,7 +39,7 @@ distutils_do_install() {
39 PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \ 39 PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \
40 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ 40 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
41 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \ 41 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \
42 bbfatal "${PYTHON_PN} setup.py install execution failed." 42 bbfatal_log "${PYTHON_PN} setup.py install execution failed."
43 43
44 # support filenames with *spaces* 44 # support filenames with *spaces*
45 # only modify file if it contains path and recompile it 45 # 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() {
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}
24distutils3_do_compile[vardepsexclude] = "MACHINE" 24distutils3_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}
37distutils3_stage_headers[vardepsexclude] = "MACHINE" 37distutils3_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}
53distutils3_stage_all[vardepsexclude] = "MACHINE" 53distutils3_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 {} \;