summaryrefslogtreecommitdiff
path: root/debian/patches/0125-printf_regression.patch
blob: 1d5cee0ae22a09dbc7f883e9f610b495c349d332 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
Description: 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.
Origin: upstream, https://github.com/SConsProject/scons/commit/2e0de3c55f22b3eaa7767b69740b898f3d2f46bf
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=878327
Forwarded: not-needed
Last-Update: 2017-10-13
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: trunk/CHANGES.txt
===================================================================
--- trunk.orig/CHANGES.txt
+++ trunk/CHANGES.txt
@@ -11,6 +11,9 @@ NOTE: This is a major release.  You shou
 Significant changes in some python action signatures. Also switching between PY 2.7 and PY 3.5, 3.6
 will cause rebuilds.
 
+  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.
 
   From William Blevins:
     - Updated D language scanner support to latest: 2.071.1. (PR #1924)
Index: trunk/engine/SCons/Script/SConscript.py
===================================================================
--- trunk.orig/engine/SCons/Script/SConscript.py
+++ trunk/engine/SCons/Script/SConscript.py
@@ -5,8 +5,6 @@ files.
 
 """
 
-from __future__ import print_function
-
 #
 # Copyright (c) 2001 - 2017 The SCons Foundation
 #