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/distutils3.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/distutils3.bbclass')
-rw-r--r-- | meta/classes/distutils3.bbclass | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass index 4f6ca44822..a6720c5b6b 100644 --- a/meta/classes/distutils3.bbclass +++ b/meta/classes/distutils3.bbclass | |||
@@ -9,14 +9,8 @@ DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \ | |||
9 | --install-data=${D}/${datadir}" | 9 | --install-data=${D}/${datadir}" |
10 | 10 | ||
11 | distutils3_do_compile() { | 11 | distutils3_do_compile() { |
12 | if [ ${BUILD_SYS} != ${HOST_SYS} ]; then | ||
13 | SYS=${MACHINE} | ||
14 | else | ||
15 | SYS=${HOST_SYS} | ||
16 | fi | ||
17 | STAGING_INCDIR=${STAGING_INCDIR} \ | 12 | STAGING_INCDIR=${STAGING_INCDIR} \ |
18 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | 13 | STAGING_LIBDIR=${STAGING_LIBDIR} \ |
19 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \ | ||
20 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ | 14 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ |
21 | build ${DISTUTILS_BUILD_ARGS} || \ | 15 | build ${DISTUTILS_BUILD_ARGS} || \ |
22 | bbfatal_log "${PYTHON_PN} setup.py build_ext execution failed." | 16 | bbfatal_log "${PYTHON_PN} setup.py build_ext execution failed." |
@@ -25,28 +19,16 @@ distutils3_do_compile[vardepsexclude] = "MACHINE" | |||
25 | 19 | ||
26 | distutils3_stage_headers() { | 20 | distutils3_stage_headers() { |
27 | install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} | 21 | install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} |
28 | if [ ${BUILD_SYS} != ${HOST_SYS} ]; then | ||
29 | SYS=${MACHINE} | ||
30 | else | ||
31 | SYS=${HOST_SYS} | ||
32 | fi | ||
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} || \ | 22 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \ |
35 | bbfatal_log "${PYTHON_PN} setup.py install_headers execution failed." | 23 | bbfatal_log "${PYTHON_PN} setup.py install_headers execution failed." |
36 | } | 24 | } |
37 | distutils3_stage_headers[vardepsexclude] = "MACHINE" | 25 | distutils3_stage_headers[vardepsexclude] = "MACHINE" |
38 | 26 | ||
39 | distutils3_stage_all() { | 27 | distutils3_stage_all() { |
40 | if [ ${BUILD_SYS} != ${HOST_SYS} ]; then | ||
41 | SYS=${MACHINE} | ||
42 | else | ||
43 | SYS=${HOST_SYS} | ||
44 | fi | ||
45 | STAGING_INCDIR=${STAGING_INCDIR} \ | 28 | STAGING_INCDIR=${STAGING_INCDIR} \ |
46 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | 29 | STAGING_LIBDIR=${STAGING_LIBDIR} \ |
47 | install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} | 30 | install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} |
48 | PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \ | 31 | PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \ |
49 | BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \ | ||
50 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ | 32 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \ |
51 | bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed." | 33 | bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed." |
52 | } | 34 | } |
@@ -54,15 +36,9 @@ distutils3_stage_all[vardepsexclude] = "MACHINE" | |||
54 | 36 | ||
55 | distutils3_do_install() { | 37 | distutils3_do_install() { |
56 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} | 38 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} |
57 | if [ ${BUILD_SYS} != ${HOST_SYS} ]; then | ||
58 | SYS=${MACHINE} | ||
59 | else | ||
60 | SYS=${HOST_SYS} | ||
61 | fi | ||
62 | STAGING_INCDIR=${STAGING_INCDIR} \ | 39 | STAGING_INCDIR=${STAGING_INCDIR} \ |
63 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | 40 | STAGING_LIBDIR=${STAGING_LIBDIR} \ |
64 | PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \ | 41 | PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \ |
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} || \ | 42 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \ |
67 | bbfatal_log "${PYTHON_PN} setup.py install execution failed." | 43 | bbfatal_log "${PYTHON_PN} setup.py install execution failed." |
68 | 44 | ||