diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2008-02-12 19:01:50 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2008-02-12 19:01:50 +0000 |
| commit | c7b5f61d6abf8fa4a3e30ec3ff849889c881192a (patch) | |
| tree | a8933bb2fa78a4d131aa1e5ce33c8bd281f74698 /games-action/btanks/files | |
| parent | old (diff) | |
| download | gentoo-2-c7b5f61d6abf8fa4a3e30ec3ff849889c881192a.tar.gz gentoo-2-c7b5f61d6abf8fa4a3e30ec3ff849889c881192a.tar.bz2 gentoo-2-c7b5f61d6abf8fa4a3e30ec3ff849889c881192a.zip | |
old
(Portage version: 2.1.3.19)
Diffstat (limited to 'games-action/btanks/files')
| -rw-r--r-- | games-action/btanks/files/btanks-0.5.4740-scons-blows.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/games-action/btanks/files/btanks-0.5.4740-scons-blows.patch b/games-action/btanks/files/btanks-0.5.4740-scons-blows.patch deleted file mode 100644 index 1290bb5b98e0..000000000000 --- a/games-action/btanks/files/btanks-0.5.4740-scons-blows.patch +++ /dev/null @@ -1,54 +0,0 @@ -Respect env build settings, dont force crappy flags, and make sure -rpath is added properly. - ---- SConstruct -+++ SConstruct -@@ -41,6 +41,18 @@ - debug = buildmode == "debug" - Export('debug') - -+import SCons.Util -+if os.environ.has_key('CC'): -+ env['CC'] = os.environ['CC'] -+if os.environ.has_key('CFLAGS'): -+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) -+if os.environ.has_key('CXX'): -+ env['CXX'] = os.environ['CXX'] -+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']) -+ - if (env['gcc_visibility']): - env.Append(CCFLAGS=' -fvisibility-inlines-hidden -fvisibility=hidden -DGCC_HASCLASSVISIBILITY ') - env.Append(CXXFLAGS=' -fvisibility-inlines-hidden -fvisibility=hidden -DGCC_HASCLASSVISIBILITY ') -@@ -81,16 +81,10 @@ - if env['gcc_visibility']: - env.Append(CCFLAGS=' -fvisibility-inlines-hidden -fvisibility=hidden '); - env.Append(CPPFLAGS=' -fvisibility-inlines-hidden -fvisibility=hidden '); -- if debug: -- env.Append(CCFLAGS='-ggdb ') -- env.Append(CPPFLAGS='-ggdb ') -- else: -- env.Append(CCFLAGS='-O3 ') -- env.Append(CPPFLAGS='-O3 ') - - al_lib = 'openal' -- env.Append(CPPFLAGS=' -Wall -pedantic -Wno-long-long -pipe -pthread ') -- env.Append(CCFLAGS=' -Wall -pedantic -Wno-long-long -pipe -pthread ') -+ env.Append(CPPFLAGS=' -Wall -pedantic -Wno-long-long -pthread ') -+ env.Append(CCFLAGS=' -Wall -pedantic -Wno-long-long -pthread ') - - - conf_env = env.Copy() ---- SConscript -+++ SConscript -@@ -94,7 +94,7 @@ - - Import('lib_dir') - if sys.platform != 'win32': -- bt_env.Append(LINKFLAGS=' -Wl,-rpath '+ lib_dir + ' -Wl,-rpath-link build/' + env['mode'] + '/mrt') -- bt_env.Append(LINKFLAGS=' -Wl,-rpath '+ lib_dir + ' -Wl,-rpath-link build/' + env['mode'] + '/sdlx') -+ bt_env.Append(LINKFLAGS=' -Wl,-rpath,'+ lib_dir + ' -Wl,-rpath-link,build/' + env['mode'] + '/mrt') -+ bt_env.Append(LINKFLAGS=' -Wl,-rpath,'+ lib_dir + ' -Wl,-rpath-link,build/' + env['mode'] + '/sdlx') - - bt_main = bt_env.Program('bt', bt_main_sources, LIBS=bt_main_libs, RPATH=[lib_dir]) |