summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <nyhm@gentoo.org>2007-03-07 16:47:16 +0000
committerTristan Heaven <nyhm@gentoo.org>2007-03-07 16:47:16 +0000
commit656b8cd532014535e803f068914954fa0083716c (patch)
tree1015f444d6116990207e95293b807889a7902b70 /games-board/pouetchess/files
parentlicense change, bug 150118 (diff)
downloadgentoo-2-656b8cd532014535e803f068914954fa0083716c.tar.gz
gentoo-2-656b8cd532014535e803f068914954fa0083716c.tar.bz2
gentoo-2-656b8cd532014535e803f068914954fa0083716c.zip
Don't use MAKEOPTS with scons
(Portage version: 2.1.2.1)
Diffstat (limited to 'games-board/pouetchess/files')
-rw-r--r--games-board/pouetchess/files/pouetchess-0.2.0-sconstruct-sandbox.patch31
1 files changed, 25 insertions, 6 deletions
diff --git a/games-board/pouetchess/files/pouetchess-0.2.0-sconstruct-sandbox.patch b/games-board/pouetchess/files/pouetchess-0.2.0-sconstruct-sandbox.patch
index 99149b7f6a7f..c33c9164787c 100644
--- a/games-board/pouetchess/files/pouetchess-0.2.0-sconstruct-sandbox.patch
+++ b/games-board/pouetchess/files/pouetchess-0.2.0-sconstruct-sandbox.patch
@@ -1,11 +1,30 @@
---- SConstruct 2006-05-27 03:44:34.000000000 +0200
-+++ SConstruct 2006-06-01 13:12:54.000000000 +0200
-@@ -28,6 +28,8 @@
+--- SConstruct
++++ SConstruct
+@@ -22,14 +22,25 @@
+
+
+
+-import os,glob
++import os,glob,SCons.Util
+
+
++# http://dev.gentoo.org/~vapier/scons-blows.txt
# create build environment
-+env = Environment()
-+env.SConsignFile()
env = Environment(tools = ['default', 'pouetChess'], toolpath = ['.'])
- env.AppendUnique(CXXFLAGS = ['-Wall'])
+-env.AppendUnique(CXXFLAGS = ['-Wall'])
++env.SConsignFile()
++
++env['CC'] = os.environ['CC']
++env['CXX'] = os.environ['CXX']
++
++if os.environ.has_key('CFLAGS'):
++ env['CCFLAGS'] = SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXXFLAGS'):
++ env['CXXFLAGS'] = SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++ env['LINKFLAGS'] = SCons.Util.CLVar(os.environ['LDFLAGS'])
+ # gather a list of source files
+ SOURCES = glob.glob('src/*.cpp')