diff options
Diffstat (limited to 'net-p2p/linuxdcpp/files/patch-SConstruct')
| -rw-r--r-- | net-p2p/linuxdcpp/files/patch-SConstruct | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/net-p2p/linuxdcpp/files/patch-SConstruct b/net-p2p/linuxdcpp/files/patch-SConstruct index 89f6a10b8ce4..1cfa3512a077 100644 --- a/net-p2p/linuxdcpp/files/patch-SConstruct +++ b/net-p2p/linuxdcpp/files/patch-SConstruct @@ -1,6 +1,6 @@ ---- SConstruct.orig Tue Aug 1 13:01:44 2006 -+++ SConstruct Thu Aug 3 12:45:35 2006 -@@ -38,28 +38,12 @@ +--- SConstruct.orig Fri Aug 18 12:37:38 2006 ++++ SConstruct Fri Aug 18 12:39:29 2006 +@@ -38,28 +38,13 @@ context.Result(ret) return ret @@ -19,7 +19,7 @@ - context.Result(retval) - return retval - -- + # Initialize the environment and configure variables -env = Environment(ENV = os.environ) @@ -31,7 +31,7 @@ conf_dir = 'build/sconf', log_file = 'build/sconf/config.log') -@@ -68,27 +52,6 @@ +@@ -68,27 +53,6 @@ # Check for dependencies @@ -59,7 +59,7 @@ if not conf.CheckPKGConfig(): print 'pkg-config not found.' Exit(1) -@@ -120,11 +83,6 @@ +@@ -120,11 +84,6 @@ print 'Can\'t live without it, sorry' Exit(1) @@ -71,11 +71,18 @@ 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,19 +96,19 @@ +@@ -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']) |