summaryrefslogtreecommitdiffstats
path: root/meta/classes
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
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')
-rw-r--r--meta/classes/distutils-tools.bbclass4
-rw-r--r--meta/classes/distutils.bbclass4
-rw-r--r--meta/classes/distutils3.bbclass24
-rw-r--r--meta/classes/gobject-introspection.bbclass2
4 files changed, 0 insertions, 34 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
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} \
10distutils_do_compile() { 10distutils_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
18distutils_stage_headers() { 17distutils_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
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
11distutils3_do_compile() { 11distutils3_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
26distutils3_stage_headers() { 20distutils3_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}
37distutils3_stage_headers[vardepsexclude] = "MACHINE" 25distutils3_stage_headers[vardepsexclude] = "MACHINE"
38 26
39distutils3_stage_all() { 27distutils3_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
55distutils3_do_install() { 37distutils3_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
diff --git a/meta/classes/gobject-introspection.bbclass b/meta/classes/gobject-introspection.bbclass
index cc7ca5ad73..f16627dacd 100644
--- a/meta/classes/gobject-introspection.bbclass
+++ b/meta/classes/gobject-introspection.bbclass
@@ -23,8 +23,6 @@ DEPENDS_append_class-nativesdk = " gobject-introspection-native"
23 23
24# This is necessary for python scripts to succeed - distutils fails if these 24# This is necessary for python scripts to succeed - distutils fails if these
25# are not set 25# are not set
26export BUILD_SYS
27export HOST_SYS
28export STAGING_INCDIR 26export STAGING_INCDIR
29export STAGING_LIBDIR 27export STAGING_LIBDIR
30 28