]> code.ossystems Code Review - openembedded-core.git/commitdiff
scons: inherit python3native
authorAnuj Mittal <anuj.mittal@intel.com>
Thu, 13 Jun 2019 00:49:10 +0000 (08:49 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 14 Jun 2019 21:47:43 +0000 (22:47 +0100)
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@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/scons.bbclass

index a8ddae35f7be1b8cff800881eb4f878693f744b0..6b171ca8df58c8f0f521fa4e4ec4bb03deb11611 100644 (file)
@@ -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."
 }