main/scons: switch back to python2

none of the packages using scons works with python3 so we switch back to
python2 for now.

1 files changed, 107 insertions, 0 deletions

diff --git a/main/scons/scons-support-python2-syntax.patch b/main/scons/scons-support-python2-syntax.patch
new file mode 100644
index 0000000000..a013539a6a
--- /dev/null
+++ b/main/scons/scons-support-python2-syntax.patch
@@ -0,0 +1,107 @@
+From 2e0de3c55f22b3eaa7767b69740b898f3d2f46bf Mon Sep 17 00:00:00 2001
+From: Thomas Berg <merlin66b@gmail.com>
+Date: Wed, 20 Sep 2017 13:24:22 +0200
+Subject: [PATCH] Support python 2 print statements in SConscripts
+
+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.
+---
+ src/CHANGES.txt                       |  3 ++
+ src/engine/SCons/Script/SConscript.py |  2 --
+ test/print_statement.py               | 56 +++++++++++++++++++++++++++++++++++
+ 3 files changed, 59 insertions(+), 2 deletions(-)
+ create mode 100644 test/print_statement.py
+
+diff --git a/src/CHANGES.txt b/src/CHANGES.txt
+index 4b492e6a..0e742ec5 100644
+--- a/CHANGES.txt
++++ b/CHANGES.txt
+@@ -11,6 +11,9 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
+ 
+     - Whatever John Doe did.
+ 
++  From Thomas Berg:
++    - Fixed a regression in scons-3.0.0 where "from __future__ import print_function" was imposed
++      on the scope where SConstruct is executed, breaking existing builds using PY 2.7.
+ 
+ RELEASE 3.0.0 - Mon, 18 Sep 2017 08:32:04 -0700
+ 
+diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py
+index 558e28f9..8fea9c4d 100644
+--- a/engine/SCons/Script/SConscript.py
++++ b/engine/SCons/Script/SConscript.py
+@@ -5,8 +5,6 @@
+ 
+ """
+ 
+-from __future__ import print_function
+-
+ #
+ # __COPYRIGHT__
+ #
+diff --git a/test/print_statement.py b/test/print_statement.py
+new file mode 100644
+index 00000000..22050593
+--- /dev/null
++++ b/print_statement.py
+@@ -0,0 +1,56 @@
++#!/usr/bin/env python
++#
++# __COPYRIGHT__
++#
++# Permission is hereby granted, free of charge, to any person obtaining
++# a copy of this software and associated documentation files (the
++# "Software"), to deal in the Software without restriction, including
++# without limitation the rights to use, copy, modify, merge, publish,
++# distribute, sublicense, and/or sell copies of the Software, and to
++# permit persons to whom the Software is furnished to do so, subject to
++# the following conditions:
++#
++# The above copyright notice and this permission notice shall be included
++# in all copies or substantial portions of the Software.
++#
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
++# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
++# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
++# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
++# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++#
++
++__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
++
++import sys
++import TestSCons
++
++test = TestSCons.TestSCons()
++
++
++test.write('SConstruct', """\
++print('python 3 style statement')
++Exit(0)
++""")
++
++test.run()
++
++test.write('SConstruct', """\
++print 'python 2 style statement'
++Exit(0)
++""")
++
++if sys.version_info >= (3,0):
++    test.skip_test('Python 2 print statement test, skipping on Python 3.\n')
++else:
++    test.run()
++
++test.pass_test()
++
++# Local Variables:
++# tab-width:4
++# indent-tabs-mode:nil
++# End:
++# vim: set expandtab tabstop=4 shiftwidth=4: