diff options
Diffstat (limited to 'net-p2p/linuxdcpp/files/patch-SConstruct')
| -rw-r--r-- | net-p2p/linuxdcpp/files/patch-SConstruct | 102 |
1 files changed, 48 insertions, 54 deletions
diff --git a/net-p2p/linuxdcpp/files/patch-SConstruct b/net-p2p/linuxdcpp/files/patch-SConstruct index 1cfa351..81cdd66 100644 --- a/net-p2p/linuxdcpp/files/patch-SConstruct +++ b/net-p2p/linuxdcpp/files/patch-SConstruct @@ -1,6 +1,6 @@ ---- SConstruct.orig Fri Aug 18 12:37:38 2006 -+++ SConstruct Fri Aug 18 12:39:29 2006 -@@ -38,28 +38,13 @@ +--- SConstruct.orig Fri Sep 1 16:52:46 2006 ++++ SConstruct Fri Sep 1 16:55:38 2006 +@@ -23,21 +23,6 @@ context.Result(ret) return ret @@ -14,52 +14,62 @@ - or (string.atoi(ret[0]) > major)): - retval = 1 - except ValueError: -- print "Oops! No C++ compiler found!" +- print "No C++ compiler found!" - - context.Result(retval) - return retval - - # Initialize the environment and configure variables + # ---------------------------------------------------------------------- + # Command-line options +@@ -62,24 +47,17 @@ + # Initialization + # ---------------------------------------------------------------------- --env = Environment(ENV = os.environ) -+env = Environment(ENV = os.environ, CC = '%%CC%%', CXX = '%%CXX%%') +-env = Environment(ENV = os.environ, options = opts) ++env = Environment(ENV = os.environ, options = opts, CC = '%%CC%%', CXX = '%%CXX%%') conf = Configure(env, -- custom_tests = {'CheckPKGConfig' : CheckPKGConfig, 'CheckPKG' : CheckPKG, 'CheckCXXVersion' : CheckCXXVersion}, -+ custom_tests = {'CheckPKGConfig' : CheckPKGConfig, 'CheckPKG' : CheckPKG}, + custom_tests = + { + 'CheckPKGConfig' : CheckPKGConfig, +- 'CheckPKG' : CheckPKG, +- 'CheckCXXVersion' : CheckCXXVersion ++ 'CheckPKG' : CheckPKG + }, conf_dir = 'build/sconf', log_file = 'build/sconf/config.log') -@@ -68,27 +53,6 @@ - - # Check for dependencies +-if os.environ.has_key('CXX'): +- env['CXX'] = os.environ['CXX'] +- +-if os.environ.has_key('CXXFLAGS'): +- env['CXXFLAGS'] = os.environ['CXXFLAGS'].split() +- + env.SConsignFile('build/sconf/.sconsign') + opts.Save('build/sconf/scache.conf', env) + Help(opts.GenerateHelpText(env)) +@@ -89,19 +67,6 @@ + # Dependencies + # ---------------------------------------------------------------------- --# This looks up the CXX enviroment variable so that people can specify --# what g++ to use on the command line (eg. prompt:> CXX=foo scons) --cxx = conf.env.Dictionary()['CXX'] --if not conf.CheckCXXVersion(cxx, 3, 4): -- if WhereIs('g++-3.4') != None: -- print 'Found g++-3.4' -- cxx = 'g++-3.4' -- else: -- print 'Compiler version check failed. g++ 3.4 or later is needed' -- Exit(1) +-if not conf.CheckCXXVersion(env['CXX'], 3, 4): +- print 'Compiler version check failed. g++ 3.4 or later is needed' +- Exit(1) - -# Add support for compiler caches to speed-up compilation. --if os.popen('distcc 2> /dev/null').read(): -- cxx = 'distcc ' + cxx +-if conf.TryAction(Action('distcc'))[0]: +- env.Prepend(CXX = 'distcc ') - print 'Enabling distcc...' --if os.popen('ccache 2> /dev/null').read(): -- cxx = 'ccache ' + cxx -- print 'Enabling ccache...' - --conf.env.Replace(CXX = cxx) +-if conf.TryAction(Action('ccache'))[0]: +- env.Prepend(CXX = 'ccache ') +- print 'Enabling ccache...' - if not conf.CheckPKGConfig(): print 'pkg-config not found.' Exit(1) -@@ -120,11 +84,6 @@ +@@ -133,11 +98,6 @@ print 'Can\'t live without it, sorry' Exit(1) @@ -71,33 +81,17 @@ if not conf.CheckLibWithHeader('z', 'zlib.h', 'c'): print 'Did not find the z library (gzip/z compression)' print 'Can\'t live without it, exiting' -@@ -138,26 +97,19 @@ - Exit(1) - - env = conf.Finish() --env.Append(CXXFLAGS = ['-I.', '-D_GNU_SOURCE', '-DENABLE_BINRELOC', '-D_FILE_OFFSET_BITS=64']) -- -- --# Allow additional CXXFLAGS to be specified by looking at the environment variable. --try: -- env.Append(CXXFLAGS = os.environ['CXXFLAGS']) --except KeyError: -- pass -+env.Append(CXXFLAGS = ['-I.', '-D_GNU_SOURCE', '-D_FILE_OFFSET_BITS=64']) - - - # Parse command line parameters +@@ -160,11 +120,11 @@ + env.Append(CXXFLAGS = Split('-I. -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64')) - debug = ARGUMENTS.get('debug', 0) - if int(debug): -- env.Append(CXXFLAGS = '-g -ggdb -D_DEBUG -Wall') -+ env.Append(CXXFLAGS = '%%CXXFLAGS%% -g -ggdb -D_DEBUG -Wall') - env.Append(LDFLAGS = '-g -ggdb') + if env['debug']: +- env.Append(CXXFLAGS = Split('-g -ggdb -D_DEBUG -Wall')) ++ env.Append(CXXFLAGS = Split('%%CXXFLAGS%% -g -ggdb -D_DEBUG -Wall')) + env.Append(LDFLAGS = Split('-g -ggdb')) - release = ARGUMENTS.get('release', 0) - if int(release): + if env['release']: - env.Append(CXXFLAGS = '-O3') + env.Append(CXXFLAGS = '%%CXXFLAGS%%') - profile = ARGUMENTS.get('profile', 0) - if int(profile): + if env['profile']: + env.Append(CXXFLAGS = '-pg') |
