diff options
| author | Tim Orling <timothy.t.orling@linux.intel.com> | 2017-11-18 18:28:56 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-13 14:00:52 +0000 |
| commit | b73e96e7f3f5d1ba3a221d99792a7a3c7ef42c21 (patch) | |
| tree | 26511020befbc8d0f54de1c031d80b21563fa35b /meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch | |
| parent | 9f8525721672577cbaab96081094211479db4c76 (diff) | |
| download | poky-b73e96e7f3f5d1ba3a221d99792a7a3c7ef42c21.tar.gz | |
python-scons: upgrade to v3.0.1; use pypi.bbclass
* Simplify recipe by using pypi.bbclass
* Drop patch for __future__ print_function
- fixed upstream:
https://github.com/SConsProject/scons/pull/1/commits/4c199d06e76afb9379e76942d0f68caa57f42509
(From OE-Core rev: cf5c44ac611c2c2657e6fd3c1f723bcb20b812dd)
Signed-off-by: Tim Orling <timothy.t.orling@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/SConscript-Support-python2-print-statements.patch')
| -rw-r--r-- | meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch | 38 |
1 files changed, 0 insertions, 38 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 deleted file mode 100644 index b1a790219e..0000000000 --- a/meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 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 | |||
