diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-04-06 17:58:36 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-01 12:38:41 +0100 |
commit | 4977a0743ba439a46716c6ef10c5958d5a561115 (patch) | |
tree | 3372a088a3e8503fbf50df08bb227a6c2ad07025 /meta/classes/distutils.bbclass | |
parent | 49557a5e9d93665e2409e4b12850dc325dee19dd (diff) | |
download | poky-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.bbclass')
-rw-r--r-- | meta/classes/distutils.bbclass | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass index da48a2ed5e..857572d759 100644 --- a/meta/classes/distutils.bbclass +++ b/meta/classes/distutils.bbclass | |||
@@ -10,14 +10,12 @@ DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \ | |||
10 | distutils_do_compile() { | 10 | distutils_do_compile() { |
11 | STAGING_INCDIR=${STAGING_INCDIR} \ | 11 | STAGING_INCDIR=${STAGING_INCDIR} \ |
12 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | 12 | STAGING_LIBDIR=${STAGING_LIBDIR} \ |
13 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ | ||
14 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py build ${DISTUTILS_BUILD_ARGS} || \ | 13 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py build ${DISTUTILS_BUILD_ARGS} || \ |
15 | bbfatal_log "${PYTHON_PN} setup.py build execution failed." | 14 | bbfatal_log "${PYTHON_PN} setup.py build execution failed." |
16 | } | 15 | } |
17 | 16 | ||
18 | distutils_stage_headers() { | 17 | distutils_stage_headers() { |
19 | install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} | 18 | install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} |
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} || \ | 19 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ |
22 | bbfatal_log "${PYTHON_PN} setup.py install_headers execution failed." | 20 | bbfatal_log "${PYTHON_PN} setup.py install_headers execution failed." |
23 | } | 21 | } |
@@ -27,7 +25,6 @@ distutils_stage_all() { | |||
27 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | 25 | STAGING_LIBDIR=${STAGING_LIBDIR} \ |
28 | install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} | 26 | install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} |
29 | PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \ | 27 | PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \ |
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} || \ | 28 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ |
32 | bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed." | 29 | bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed." |
33 | } | 30 | } |
@@ -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 | ||