Accepting request 246767 from devel:tools:building
1 OBS-URL: https://build.opensuse.org/request/show/246767 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/scons?expand=0&rev=26
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
2a3112445c
@ -1,77 +0,0 @@
|
||||
From: Dirk Baechle <dl9obn@darc.de>
|
||||
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 <dl9obn@darc.de>
|
||||
# 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__)} $)'
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f993320c5e9515e6567fcce73df0a7a8808414bf1223c69123d3dcf339a449d4
|
||||
size 621932
|
||||
3
scons-2.3.3.tar.gz
Normal file
3
scons-2.3.3.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:63a74e1012ad9ad54950eafc69604fd9246e1a405c18acf936caa433c97cc0e2
|
||||
size 622434
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1464b777cdc6be20347a6a0db42bb03dcf1c76bd5c3faa4e032f5156b9b1c287
|
||||
size 149205
|
||||
3
scons-user.html-2.3.3.tar.bz2
Normal file
3
scons-user.html-2.3.3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6114afd3cd21c6b0e4562ba1a1b903ef5eac97240600b53eeddf2eab6fa29363
|
||||
size 149235
|
||||
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 28 20:46:40 UTC 2014 - andreas.stieger@gmx.de
|
||||
|
||||
- SCons 2.3.3:
|
||||
* New functionality:
|
||||
- Added Copy Action symlink soft-copy support
|
||||
* Changed/Enhanced existing functionality:
|
||||
- Improved SWIG detection
|
||||
* Fixes:
|
||||
- Fix regression on Windows in D language update
|
||||
- Fixed the newglossary action to work with VariantDir (LaTeX).
|
||||
- Added a default for the BUILDERS environment variable,
|
||||
to prevent not defined exception on a Clone().
|
||||
- Fixed handling of CPPDEFINE var in Append()
|
||||
for several list-dict combinations
|
||||
- Remove scons-2.3.2-python.patch, committed upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 7 19:20:13 UTC 2014 - andreas.stieger@gmx.de
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@ Name: scons
|
||||
Summary: Replacement for Make
|
||||
License: MIT
|
||||
Group: Development/Tools/Building
|
||||
Version: 2.3.2
|
||||
Version: 2.3.3
|
||||
Release: 0
|
||||
Source0: http://prdownloads.sourceforge.net/scons/%{name}-%{version}.tar.gz
|
||||
#http://www.scons.org/doc/%%{version}/HTML/scons-user.html
|
||||
@ -36,7 +36,6 @@ Source99: %{name}-rpmlintrc
|
||||
# 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
|
||||
@ -57,7 +56,6 @@ full power of Python to control compilation.
|
||||
%setup -q -a1
|
||||
%patch0 -p1
|
||||
%patch1
|
||||
%patch2 -p2
|
||||
|
||||
# fix libdir for qt
|
||||
patch -p0 <<EOF
|
||||
|
||||
Loading…
Reference in New Issue
Block a user