diff options
| author | Oliver Lehmann <oliver@FreeBSD.org> | 2010-01-08 10:32:17 +0000 |
|---|---|---|
| committer | Oliver Lehmann <oliver@FreeBSD.org> | 2010-01-08 10:32:17 +0000 |
| commit | f8399feeca94c52aad8276fda31cb0f4d4d37a69 (patch) | |
| tree | c7c85b0bcc993b285a528d9d455eeeee261ef466 /games/freeorion/files | |
| parent | ebdbc782d869220b4559f278824cfe9523aa39a2 (diff) | |
| download | ports-f8399feeca94c52aad8276fda31cb0f4d4d37a69.tar.gz ports-f8399feeca94c52aad8276fda31cb0f4d4d37a69.zip | |
fix the linking of freeorion to pick up the right libstdc++ library
PR: ports/142432
Submitted By: Rusty Nejdl <rnejdl@ringofsaturn.com>
Notes
Notes:
svn path=/head/; revision=247392
Diffstat (limited to 'games/freeorion/files')
| -rw-r--r-- | games/freeorion/files/patch-SConstruct | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/games/freeorion/files/patch-SConstruct b/games/freeorion/files/patch-SConstruct index 2635afaaa950..7a90b7d15c62 100644 --- a/games/freeorion/files/patch-SConstruct +++ b/games/freeorion/files/patch-SConstruct @@ -1,6 +1,25 @@ ---- SConstruct.orig 2009-03-16 18:14:04.000000000 +0100 -+++ SConstruct 2009-03-16 20:03:14.000000000 +0100 -@@ -197,6 +197,15 @@ +--- SConstruct.orig 2009-05-23 05:47:29.000000000 +0200 ++++ SConstruct 2010-01-08 06:47:48.000000000 +0100 +@@ -25,6 +25,8 @@ + options.Add('CC', 'The C-Compiler used to compile C-Files') + options.Add('CXX', 'The C++-Compiler used to compile C++-Files') + options.Add('CPPDEFINES', 'C++-Compiler macros') ++options.Add('CCFLAGS', 'C compiler flags', Split('')) ++options.Add('LINKFLAGS', 'C linker flags', Split('')) + options.Add(BoolOption('release', 'Build for public release (random numbers are nondeterminisitc, etc.). This will force debug=0.', 0)) + options.Add(BoolOption('debug', 'Generate debug code', 0)) + options.Add(BoolOption('multithreaded', 'Generate multithreaded code', 1)) +@@ -119,6 +122,9 @@ + + options.Update(env) + ++env['CCFLAGS'] = Split(env['CCFLAGS']) ++env['LINKFLAGS'] = Split(env['LINKFLAGS']) ++ + if env.has_key('use_distcc') and env['use_distcc']: + if 'distcc' not in env['CC']: + env['CC'] = 'distcc %s' % env['CC'] +@@ -197,6 +204,15 @@ else: print 'Configuring unknown system (assuming the system is POSIX-like) ...' @@ -16,7 +35,7 @@ # Python import distutils.sysconfig if str(Platform()) == 'win32': -@@ -216,6 +225,8 @@ +@@ -216,6 +232,8 @@ matches = regex.findall(distutils.sysconfig.get_config_var('LDLIBRARY')) if len(matches): python_libname = matches[0] @@ -25,7 +44,7 @@ else: print 'Unable to determine the name of the Python runtime library. Terminating....' Exit(1) -@@ -265,15 +276,6 @@ +@@ -268,15 +286,6 @@ BoostLibWin32Name('python', env) ]) |