diff options
Diffstat (limited to 'games-action/btanks/files/btanks-0.7.5800-scons-blows.patch')
| -rw-r--r-- | games-action/btanks/files/btanks-0.7.5800-scons-blows.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/games-action/btanks/files/btanks-0.7.5800-scons-blows.patch b/games-action/btanks/files/btanks-0.7.5800-scons-blows.patch new file mode 100644 index 000000000000..f3e9fed3bd76 --- /dev/null +++ b/games-action/btanks/files/btanks-0.7.5800-scons-blows.patch @@ -0,0 +1,35 @@ +Respect env build settings, dont force crappy flags, and make sure -rpath is added properly. + +--- SConstruct ++++ SConstruct +@@ -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]) |