summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools/python/python-scons
diff options
context:
space:
mode:
authorJose Lamego <jose.a.lamego@linux.intel.com>2017-10-19 14:28:25 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-05 13:54:44 +0000
commit4fe7774f08ba46bd1d68e56eff3f4912db107c25 (patch)
tree331a04de1084f4d4e68bcd7c6342ebc35f743c89 /meta/recipes-devtools/python/python-scons
parentb36100bb3077947361c858f891eb15a76013671e (diff)
downloadopenembedded-core-4fe7774f08ba46bd1d68e56eff3f4912db107c25.tar.gz
openembedded-core-4fe7774f08ba46bd1d68e56eff3f4912db107c25.tar.bz2
openembedded-core-4fe7774f08ba46bd1d68e56eff3f4912db107c25.zip
python-scons*: upgrade to 3.0.0
Both python-scons and python-scons-native need to be upgraded to latest upstream version. LIC_FILES_CHKSUM changed due to updated year in date, but rest of file remain the same. Following dependencies were added to enable appropriate package usage: python-shell, python-pprint and python-importlib. A patch was taken from upstream to support python2 print statements in SConscripts. This should be included in next version. These changes were tested in qemux86 with core-image-minimal. Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools/python/python-scons')
-rw-r--r--meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch b/meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch
new file mode 100644
index 0000000000..b1a790219e
--- /dev/null
+++ b/meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch
@@ -0,0 +1,38 @@
+From 885aabdb313685405737112dcb7d7774eee6d879 Mon Sep 17 00:00:00 2001
+From: Thomas Berg <merlin66b@gmail.com>
+Date: Thu, 19 Oct 2017 14:02:21 -0500
+Subject: [PATCH] SConscript: Support python2 print statements
+
+This fixes a regression introduced in scons-3.0.0, where
+SConscripts containing python 2 print statements would cause
+syntax errors even when executing scons with python 2.7.
+
+This ensures backward compatibility, allowing users to build
+legacy code with scons-3.0.0 without having to patch it.
+
+Taken from
+https://github.com/SConsProject/scons/commit/2e0de3c55f22b3eaa7767b69740b898f3d2f46bf
+
+Upstream-Status: Accepted
+
+Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com>
+---
+ engine/SCons/Script/SConscript.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/engine/SCons/Script/SConscript.py b/engine/SCons/Script/SConscript.py
+index bc05540..332d1fa 100644
+--- a/engine/SCons/Script/SConscript.py
++++ b/engine/SCons/Script/SConscript.py
+@@ -5,8 +5,6 @@ files.
+
+ """
+
+-from __future__ import print_function
+-
+ #
+ # Copyright (c) 2001 - 2017 The SCons Foundation
+ #
+--
+2.7.4
+