Hello community, here is the log from the commit of package scons for openSUSE:Factory checked in at 2014-08-11 10:06:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scons (Old) and /work/SRC/openSUSE:Factory/.scons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scons" Changes: -------- --- /work/SRC/openSUSE:Factory/scons/scons.changes 2014-08-06 15:31:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scons.new/scons.changes 2014-08-11 10:06:57.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 7 19:20:13 UTC 2014 - [email protected] + +- Fix SCons with python 2.6 on SLE, including building serf: + add scons-2.3.2-python.patch + +------------------------------------------------------------------- New: ---- scons-2.3.2-python.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scons.spec ++++++ --- /var/tmp/diff_new_pack.lMXphS/_old 2014-08-11 10:06:58.000000000 +0200 +++ /var/tmp/diff_new_pack.lMXphS/_new 2014-08-11 10:06:58.000000000 +0200 @@ -36,6 +36,7 @@ # Sets _mandir to _datadir/man instead of _prefix/man Patch0: %{name}-1.2.0-fix-install.patch Patch1: %{name}-1.2.0-noenv.patch +Patch2: scons-2.3.2-python.patch Url: http://www.scons.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes @@ -56,6 +57,8 @@ %setup -q -a1 %patch0 -p1 %patch1 +%patch2 -p2 + # fix libdir for qt patch -p0 <<EOF --- engine/SCons/Tool/qt.py ++++++ scons-2.3.2-python.patch ++++++ From: Dirk Baechle <[email protected]> Date: 2014-07-15 Subject: - fix for issue #2963, "Split broken" (= format() in D tools is incompatible with Python 2.6) References: http://scons.tigris.org/issues/show_bug.cgi?id=2963 https://bitbucket.org/scons/scons/commits/1444ad9af1d3b6148451af3f0596cba0ad352c50 Upstream: Committed Fixes build of serf 1.3.6 with scons 2.3.2 on SLE_11_SP3 and earlier. Message: [ 13s] ValueError: zero length field name in format: [ 13s] File "/usr/src/packages/BUILD/serf-1.3.6/SConstruct", line 22: [ 13s] EnsureSConsVersion(2,3,0) [ 13s] File "/usr/lib/python2.6/site-packages/SCons/Script/SConscript.py", line 607: [ 13s] env = self.factory() [ 13s] File "/usr/lib/python2.6/site-packages/SCons/Script/SConscript.py", line 587: [ 13s] default_env = SCons.Defaults.DefaultEnvironment() [ 13s] File "/usr/lib/python2.6/site-packages/SCons/Defaults.py", line 88: [ 13s] _default_env = SCons.Environment.Environment(*args, **kw) [ 13s] File "/usr/lib/python2.6/site-packages/SCons/Environment.py", line 1003: [ 13s] apply_tools(self, tools, toolpath) [ 13s] File "/usr/lib/python2.6/site-packages/SCons/Environment.py", line 107: [ 13s] env.Tool(tool) [ 13s] File "/usr/lib/python2.6/site-packages/SCons/Environment.py", line 1787: [ 13s] tool(self) [ 13s] File "/usr/lib/python2.6/site-packages/SCons/Tool/__init__.py", line 183: [ 13s] self.generate(env, *args, **kw) [ 13s] File "/usr/lib/python2.6/site-packages/SCons/Tool/default.py", line 41: [ 13s] SCons.Tool.Tool(t)(env) [ 13s] File "/usr/lib/python2.6/site-packages/SCons/Tool/__init__.py", line 183: [ 13s] self.generate(env, *args, **kw) [ 13s] File "/usr/lib/python2.6/site-packages/SCons/Tool/dmd.py", line 131: [ 13s] env['DLIBCOM'] = '$DLIB $_DLIBFLAGS {} $TARGET $SOURCES $_DLIBFLAGS'.format('-c' if env['PLATFORM'] == 'win32' else '') [ 13s] error: Bad exit status from /var/tmp/rpm-tmp.11595 (%build) # HG changeset patch # User Dirk Baechle <[email protected]> # Date 1405443486 -7200 # Node ID 1444ad9af1d3b6148451af3f0596cba0ad352c50 # Parent 03a9d6241942c4f41619b5fc281a8de56ae77216 - fix for issue #2963, "Split broken" (= format() in D tools is incompatible with Python 2.6) diff --git a/src/engine/SCons/Tool/dmd.py b/src/engine/SCons/Tool/dmd.py --- a/src/engine/SCons/Tool/dmd.py +++ b/src/engine/SCons/Tool/dmd.py @@ -128,7 +128,7 @@ env['DLIB'] = 'lib' if env['PLATFORM'] == 'win32' else 'ar cr' - env['DLIBCOM'] = '$DLIB $_DLIBFLAGS {} $TARGET $SOURCES $_DLIBFLAGS'.format('-c' if env['PLATFORM'] == 'win32' else '') + env['DLIBCOM'] = '$DLIB $_DLIBFLAGS {0}$TARGET $SOURCES $_DLIBFLAGS'.format('-c ' if env['PLATFORM'] == 'win32' else '') #env['_DLIBFLAGS'] = '$( ${_concat(DLIBFLAGPREFIX, DLIBFLAGS, DLIBFLAGSUFFIX, __env__)} $)' diff --git a/src/engine/SCons/Tool/gdc.py b/src/engine/SCons/Tool/gdc.py --- a/src/engine/SCons/Tool/gdc.py +++ b/src/engine/SCons/Tool/gdc.py @@ -102,7 +102,7 @@ env['SHDLINKCOM'] = '$DLINK -o $TARGET $DLINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS' env['DLIB'] = 'lib' if env['PLATFORM'] == 'win32' else 'ar cr' - env['DLIBCOM'] = '$DLIB $_DLIBFLAGS {} $TARGET $SOURCES $_DLINKLIBFLAGS'.format('-c' if env['PLATFORM'] == 'win32' else '') + env['DLIBCOM'] = '$DLIB $_DLIBFLAGS {0}$TARGET $SOURCES $_DLINKLIBFLAGS'.format('-c ' if env['PLATFORM'] == 'win32' else '') env['_DLIBFLAGS'] = '$( ${_concat(DLIBFLAGPREFIX, DLIBFLAGS, DLIBFLAGSUFFIX, __env__)} $)' diff --git a/src/engine/SCons/Tool/ldc.py b/src/engine/SCons/Tool/ldc.py --- a/src/engine/SCons/Tool/ldc.py +++ b/src/engine/SCons/Tool/ldc.py @@ -117,7 +117,7 @@ env['DLIB'] = 'lib' if env['PLATFORM'] == 'win32' else 'ar cr' - env['DLIBCOM'] = '$DLIB $_DLIBFLAGS {} $TARGET $SOURCES $_DLIBFLAGS'.format('-c' if env['PLATFORM'] == 'win32' else '') + env['DLIBCOM'] = '$DLIB $_DLIBFLAGS {0}$TARGET $SOURCES $_DLIBFLAGS'.format('-c ' if env['PLATFORM'] == 'win32' else '') #env['_DLIBFLAGS'] = '$( ${_concat(DLIBFLAGPREFIX, DLIBFLAGS, DLIBFLAGSUFFIX, __env__)} $)' -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
