- prevent a regression that would require Python3 syntax for
print statements, add scons-3.0.0-support-python-2-prints.patch OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/scons?expand=0&rev=48
This commit is contained in:
Git OBS Bridge
parent
11743df095
commit
9f4f0f0277
91
scons-3.0.0-support-python-2-prints.patch
Normal file
91
scons-3.0.0-support-python-2-prints.patch
Normal file
@ -0,0 +1,91 @@
|
||||
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/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
|
||||
|
||||
Index: scons-3.0.0/engine/SCons/Script/SConscript.py
|
||||
===================================================================
|
||||
--- scons-3.0.0.orig/engine/SCons/Script/SConscript.py
|
||||
+++ scons-3.0.0/engine/SCons/Script/SConscript.py
|
||||
@@ -5,8 +5,6 @@ files.
|
||||
|
||||
"""
|
||||
|
||||
-from __future__ import print_function
|
||||
-
|
||||
#
|
||||
# Copyright (c) 2001 - 2017 The SCons Foundation
|
||||
#
|
||||
Index: scons-3.0.0/print_statement.py
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ scons-3.0.0/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:
|
||||
@ -1,5 +1,5 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 4 18:49:41 UTC 2017 - astieger@suse.com
|
||||
Wed Oct 4 19:09:07 UTC 2017 - astieger@suse.com
|
||||
|
||||
- SCons 3.0.0, a major release:
|
||||
* Some targets may rebuild when upgrading.
|
||||
@ -13,6 +13,8 @@ Wed Oct 4 18:49:41 UTC 2017 - astieger@suse.com
|
||||
scons-3.0.0-fix-install.patch
|
||||
- drop scons-1.2.0-noenv.patch, fix is done in spec
|
||||
- drop rpmlintrc, no longer needed
|
||||
- prevent a regression that would require Python3 syntax for
|
||||
print statements, add scons-3.0.0-support-python-2-prints.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 22 12:44:48 UTC 2016 - astieger@suse.com
|
||||
|
||||
@ -33,6 +33,7 @@ Source0: http://prdownloads.sourceforge.net/scons/%{name}-%{version}.tar.
|
||||
Source1: scons-user.html-%{version}.tar.bz2
|
||||
# Sets _mandir to _datadir/man instead of _prefix/man
|
||||
Patch0: %{name}-3.0.0-fix-install.patch
|
||||
Patch1: scons-3.0.0-support-python-2-prints.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: python-devel >= 2.7
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -53,6 +54,7 @@ full power of Python to control compilation.
|
||||
%prep
|
||||
%setup -q -a1
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
# fix libdir for qt
|
||||
patch -p0 <<EOF
|
||||
|
||||
Loading…
Reference in New Issue
Block a user