diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2019-06-13 08:49:10 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-14 22:48:22 +0100 |
commit | 53099ced25bd86cfb45c42ad50a42e220b65fb6b (patch) | |
tree | f381d91d21804098a03dfef0901c6010c7bf37e6 /meta/classes | |
parent | b168b3ac94f2a35eea0bbb82ddd67e466dbfb5ba (diff) | |
download | poky-53099ced25bd86cfb45c42ad50a42e220b65fb6b.tar.gz |
scons: inherit python3native
scons tries to get build time vars by loading sysconfigdata. Inherit
python3native instead of using host python and unset
_PYTHON_SYSCONFIGDATA_NAME to avoid the need to depend on target
python3 for sysconfigdata when using scons to build.
Avoids build errors on still supported CentOS 7:
| DEBUG: Executing shell function do_compile
| scons: *** SCons version 3.0.5 does not run under Python version
3.4.8.
| Python 2.7 or >= 3.5 is required.
(From OE-Core rev: 44f303ba9fb193a985e8e4b7c6962883ae3970d1)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/scons.bbclass | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/scons.bbclass b/meta/classes/scons.bbclass index a8ddae35f7..6b171ca8df 100644 --- a/meta/classes/scons.bbclass +++ b/meta/classes/scons.bbclass | |||
@@ -1,8 +1,11 @@ | |||
1 | inherit python3native | ||
2 | |||
1 | DEPENDS += "python3-scons-native" | 3 | DEPENDS += "python3-scons-native" |
2 | 4 | ||
3 | EXTRA_OESCONS ?= "" | 5 | EXTRA_OESCONS ?= "" |
4 | 6 | ||
5 | do_configure() { | 7 | do_configure() { |
8 | unset _PYTHON_SYSCONFIGDATA_NAME | ||
6 | if [ -n "${CONFIGURESTAMPFILE}" ]; then | 9 | if [ -n "${CONFIGURESTAMPFILE}" ]; then |
7 | if [ -e "${CONFIGURESTAMPFILE}" -a "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${CLEANBROKEN}" != "1" ]; then | 10 | if [ -e "${CONFIGURESTAMPFILE}" -a "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${CLEANBROKEN}" != "1" ]; then |
8 | ${STAGING_BINDIR_NATIVE}/scons --clean PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} | 11 | ${STAGING_BINDIR_NATIVE}/scons --clean PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} |
@@ -14,11 +17,13 @@ do_configure() { | |||
14 | } | 17 | } |
15 | 18 | ||
16 | scons_do_compile() { | 19 | scons_do_compile() { |
20 | unset _PYTHON_SYSCONFIGDATA_NAME | ||
17 | ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} || \ | 21 | ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} || \ |
18 | die "scons build execution failed." | 22 | die "scons build execution failed." |
19 | } | 23 | } |
20 | 24 | ||
21 | scons_do_install() { | 25 | scons_do_install() { |
26 | unset _PYTHON_SYSCONFIGDATA_NAME | ||
22 | ${STAGING_BINDIR_NATIVE}/scons install_root=${D}${prefix} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} install || \ | 27 | ${STAGING_BINDIR_NATIVE}/scons install_root=${D}${prefix} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} install || \ |
23 | die "scons install execution failed." | 28 | die "scons install execution failed." |
24 | } | 29 | } |