[oe-commits] [openembedded-core] 05/08: scons: inherit python3native

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit f57987dfb6b76af2d2384f6a52ac59572e94fc65
Author: Anuj Mittal <anuj.mittal at intel.com>
AuthorDate: Thu Jun 13 08:49:10 2019 +0800

    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.
    
    Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/scons.bbclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/classes/scons.bbclass b/meta/classes/scons.bbclass
index a8ddae3..6b171ca 100644
--- a/meta/classes/scons.bbclass
+++ b/meta/classes/scons.bbclass
@@ -1,8 +1,11 @@
+inherit python3native
+
 DEPENDS += "python3-scons-native"
 
 EXTRA_OESCONS ?= ""
 
 do_configure() {
+	unset _PYTHON_SYSCONFIGDATA_NAME
 	if [ -n "${CONFIGURESTAMPFILE}" ]; then
 		if [ -e "${CONFIGURESTAMPFILE}" -a "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${CLEANBROKEN}" != "1" ]; then
 			${STAGING_BINDIR_NATIVE}/scons --clean PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS}
@@ -14,11 +17,13 @@ do_configure() {
 }
 
 scons_do_compile() {
+	unset _PYTHON_SYSCONFIGDATA_NAME
 	${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} || \
 	die "scons build execution failed."
 }
 
 scons_do_install() {
+	unset _PYTHON_SYSCONFIGDATA_NAME
 	${STAGING_BINDIR_NATIVE}/scons install_root=${D}${prefix} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} install || \
 	die "scons install execution failed."
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.