summaryrefslogtreecommitdiffstats
path: root/meta/classes/distutils-tools.bbclass
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-04-06 17:58:36 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-01 12:38:41 +0100
commit4977a0743ba439a46716c6ef10c5958d5a561115 (patch)
tree3372a088a3e8503fbf50df08bb227a6c2ad07025 /meta/classes/distutils-tools.bbclass
parent49557a5e9d93665e2409e4b12850dc325dee19dd (diff)
downloadpoky-4977a0743ba439a46716c6ef10c5958d5a561115.tar.gz
python-native, python3-native: remove the use of exported HOST_SYS and BUILD_SYS variables
The code that utilized them was superseded by the code (in the same patch!) that is utilizing STAGING_LIBDIR/STAGING_INCDIR, and wasn't correct in the first place as HOST_SYS is not necessarily the same as the sysroot directory name. (From OE-Core rev: 8834e81a38c24a066bb4fefa93da61011d0db244) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/distutils-tools.bbclass')
-rw-r--r--meta/classes/distutils-tools.bbclass4
1 files changed, 0 insertions, 4 deletions
diff --git a/meta/classes/distutils-tools.bbclass b/meta/classes/distutils-tools.bbclass
index 8d9b3f78f7..3ef9cc5a78 100644
--- a/meta/classes/distutils-tools.bbclass
+++ b/meta/classes/distutils-tools.bbclass
@@ -8,14 +8,12 @@ DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \
8distutils_do_compile() { 8distutils_do_compile() {
9 STAGING_INCDIR=${STAGING_INCDIR} \ 9 STAGING_INCDIR=${STAGING_INCDIR} \
10 STAGING_LIBDIR=${STAGING_LIBDIR} \ 10 STAGING_LIBDIR=${STAGING_LIBDIR} \
11 BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
12 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py build ${DISTUTILS_BUILD_ARGS} || \ 11 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py build ${DISTUTILS_BUILD_ARGS} || \
13 bbfatal_log "${PYTHON_PN} setup.py build_ext execution failed." 12 bbfatal_log "${PYTHON_PN} setup.py build_ext execution failed."
14} 13}
15 14
16distutils_stage_headers() { 15distutils_stage_headers() {
17 install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} 16 install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
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} || \ 17 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
20 bbfatal_log "${PYTHON_PN} setup.py install_headers execution failed." 18 bbfatal_log "${PYTHON_PN} setup.py install_headers execution failed."
21} 19}
@@ -25,7 +23,6 @@ distutils_stage_all() {
25 STAGING_LIBDIR=${STAGING_LIBDIR} \ 23 STAGING_LIBDIR=${STAGING_LIBDIR} \
26 install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} 24 install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
27 PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \ 25 PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
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} || \ 26 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
30 bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed." 27 bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed."
31} 28}
@@ -37,7 +34,6 @@ distutils_do_install() {
37 STAGING_INCDIR=${STAGING_INCDIR} \ 34 STAGING_INCDIR=${STAGING_INCDIR} \
38 STAGING_LIBDIR=${STAGING_LIBDIR} \ 35 STAGING_LIBDIR=${STAGING_LIBDIR} \
39 PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \ 36 PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \
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} || \ 37 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \
42 bbfatal_log "${PYTHON_PN} setup.py install execution failed." 38 bbfatal_log "${PYTHON_PN} setup.py install execution failed."
43 39