Accepting request 545189 from devel:tools:building
OBS-URL: https://build.opensuse.org/request/show/545189 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/scons?expand=0&rev=35
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
45e1aa3aef
@ -1,91 +0,0 @@
|
||||
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,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0f532f405b98c60b731d231b3c503ab5bf47d89a6f66f70cb62c9249e9f45216
|
||||
size 630418
|
||||
3
scons-3.0.1.tar.gz
Normal file
3
scons-3.0.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:24475e38d39c19683bc88054524df018fe6949d70fbd4c69e298d39a0269f173
|
||||
size 634815
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3e0198ce5b1b561a8ba6887be2b9eb38dac3c7b56d269188a9740252c3fdfe51
|
||||
size 153266
|
||||
3
scons-user.html-3.0.1.tar.bz2
Normal file
3
scons-user.html-3.0.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:85123f0fb5c34c2bec170baf19790a0ea51252abae1fdb94d587c7b0f1e798da
|
||||
size 154780
|
||||
@ -1,3 +1,30 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 24 08:48:43 UTC 2017 - mpluskal@suse.com
|
||||
|
||||
- Explicitly require python3 for python3 version of scons as
|
||||
dependency does not get generated automatically
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 15 16:28:48 UTC 2017 - astieger@suse.com
|
||||
|
||||
- SCons 3.0.1:
|
||||
* Fix return value handling in to_String_for_subst()
|
||||
* Fixe Variables.GenerateHelpText() to now use the sort parameter
|
||||
* Fix Tool loading logic from exploding sys.path with many
|
||||
site_scons/site_tools prepended on py3.
|
||||
* Add additional output with time to process each SConscript file
|
||||
when using --debug=time.
|
||||
* Fix broken subst logic with "$$([...])"
|
||||
* Java/Jar building improvements and fixes
|
||||
- Packaging changes:
|
||||
* drop scons-3.0.0-support-python-2-prints.patch, now upstream
|
||||
* Restore python2 support for SLE 12 and Leap 42.x
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 3 11:22:45 UTC 2017 - mpluskal@suse.com
|
||||
|
||||
- Switch to python3
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 4 19:09:07 UTC 2017 - astieger@suse.com
|
||||
|
||||
|
||||
40
scons.spec
40
scons.spec
@ -16,13 +16,9 @@
|
||||
#
|
||||
|
||||
|
||||
# Potential build fix for SLE11 SLE11SP1
|
||||
%if 0%{?suse_version} <= 1120
|
||||
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
||||
%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
|
||||
%endif
|
||||
%define with_python3 (0%{?suse_version} > 1320)
|
||||
Name: scons
|
||||
Version: 3.0.0
|
||||
Version: 3.0.1
|
||||
Release: 0
|
||||
Summary: Replacement for Make
|
||||
License: MIT
|
||||
@ -33,15 +29,13 @@ 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
|
||||
%if 0%{?suse_version} > 1110
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1110
|
||||
%py_requires
|
||||
%if %{with_python3}
|
||||
BuildRequires: python3-devel >= 3.5
|
||||
Requires: python3-base >= 3.5
|
||||
%else
|
||||
BuildRequires: python-devel >= 2.7
|
||||
%endif
|
||||
|
||||
%description
|
||||
@ -54,7 +48,6 @@ full power of Python to control compilation.
|
||||
%prep
|
||||
%setup -q -a1
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
# fix libdir for qt
|
||||
patch -p0 <<EOF
|
||||
@ -65,26 +58,41 @@ patch -p0 <<EOF
|
||||
+ QT_LIBPATH = os.path.join('\$QTDIR', '%{_lib}'),
|
||||
EOF
|
||||
|
||||
%if %{with_python3}
|
||||
sed -i 's|%{_bindir}/env python|%{_bindir}/python3|' script/*
|
||||
%else
|
||||
sed -i 's|%{_bindir}/env python|%{_bindir}/python|' script/*
|
||||
%endif
|
||||
|
||||
%build
|
||||
export CFLAGS="%{optflags}"
|
||||
%if %{with_python3}
|
||||
%python3_build
|
||||
%else
|
||||
python setup.py build
|
||||
%endif
|
||||
|
||||
%install
|
||||
%if %{with_python3}
|
||||
%python3_install
|
||||
%else
|
||||
python setup.py \install \
|
||||
--prefix=%{_prefix} \
|
||||
--root=%{buildroot} \
|
||||
--install-lib=%{python_sitelib} \
|
||||
--no-version-script
|
||||
%endif
|
||||
%fdupes %{buildroot}%{_bindir}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc CHANGES.txt LICENSE.txt README.txt RELEASE.txt scons-user.html
|
||||
%{_bindir}/*
|
||||
%if %{with_python3}
|
||||
%{_libexecdir}/scons-%{version}
|
||||
%else
|
||||
%{python_sitelib}/SCons/
|
||||
%{python_sitelib}/*.egg-info
|
||||
%{_mandir}/man1/*.gz
|
||||
%endif
|
||||
%{_mandir}/man1/*%{ext_man}
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user