diff options
author | Jose Lamego <jose.a.lamego@linux.intel.com> | 2017-10-19 14:28:25 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-05 22:33:22 +0000 |
commit | b55218a024f2b529ccbe0e321228b9595ce67b51 (patch) | |
tree | 5b8fb85c448cf91610bd2687e12c7778682c0f4a /meta/recipes-devtools/python/python-scons | |
parent | b063b982a4b1d1a28cc35ff9b60bb6b310fe344a (diff) | |
download | poky-b55218a024f2b529ccbe0e321228b9595ce67b51.tar.gz |
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.
(From OE-Core rev: 4fe7774f08ba46bd1d68e56eff3f4912db107c25)
Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python-scons')
-rw-r--r-- | meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch | 38 |
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 @@ | |||
1 | From 885aabdb313685405737112dcb7d7774eee6d879 Mon Sep 17 00:00:00 2001 | ||
2 | From: Thomas Berg <merlin66b@gmail.com> | ||
3 | Date: Thu, 19 Oct 2017 14:02:21 -0500 | ||
4 | Subject: [PATCH] SConscript: Support python2 print statements | ||
5 | |||
6 | This fixes a regression introduced in scons-3.0.0, where | ||
7 | SConscripts containing python 2 print statements would cause | ||
8 | syntax errors even when executing scons with python 2.7. | ||
9 | |||
10 | This ensures backward compatibility, allowing users to build | ||
11 | legacy code with scons-3.0.0 without having to patch it. | ||
12 | |||
13 | Taken from | ||
14 | https://github.com/SConsProject/scons/commit/2e0de3c55f22b3eaa7767b69740b898f3d2f46bf | ||
15 | |||
16 | Upstream-Status: Accepted | ||
17 | |||
18 | Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com> | ||
19 | --- | ||
20 | engine/SCons/Script/SConscript.py | 2 -- | ||
21 | 1 file changed, 2 deletions(-) | ||
22 | |||
23 | diff --git a/engine/SCons/Script/SConscript.py b/engine/SCons/Script/SConscript.py | ||
24 | index bc05540..332d1fa 100644 | ||
25 | --- a/engine/SCons/Script/SConscript.py | ||
26 | +++ b/engine/SCons/Script/SConscript.py | ||
27 | @@ -5,8 +5,6 @@ files. | ||
28 | |||
29 | """ | ||
30 | |||
31 | -from __future__ import print_function | ||
32 | - | ||
33 | # | ||
34 | # Copyright (c) 2001 - 2017 The SCons Foundation | ||
35 | # | ||
36 | -- | ||
37 | 2.7.4 | ||
38 | |||