diff options
Diffstat (limited to 'net-p2p/linuxdcpp/files/patch-SConstruct')
| -rw-r--r-- | net-p2p/linuxdcpp/files/patch-SConstruct | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/net-p2p/linuxdcpp/files/patch-SConstruct b/net-p2p/linuxdcpp/files/patch-SConstruct index 20fa13e02dd2..14160dc3a604 100644 --- a/net-p2p/linuxdcpp/files/patch-SConstruct +++ b/net-p2p/linuxdcpp/files/patch-SConstruct @@ -1,6 +1,6 @@ ---- SConstruct.orig 2011-04-18 01:57:09.000000000 +0800 -+++ SConstruct 2011-10-19 23:42:24.000000000 +0800 -@@ -20,7 +20,7 @@ +--- SConstruct.orig 2011-04-17 17:57:09 UTC ++++ SConstruct +@@ -20,7 +20,7 @@ BUILD_LOCALE_PATH = BUILD_PATH + 'locale BUILD_FLAGS = { 'common' : ['-I#', '-D_GNU_SOURCE', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_REENTRANT'], 'debug' : ['-g', '-ggdb', '-Wall', '-D_DEBUG'], @@ -9,7 +9,7 @@ } # ---------------------------------------------------------------------- -@@ -106,6 +106,7 @@ +@@ -106,6 +106,7 @@ else: vars.AddVariables( BoolVariable('debug', 'Compile the program with debug information', 0), BoolVariable('release', 'Compile the program with optimizations', 0), @@ -17,7 +17,7 @@ BoolVariable('profile', 'Compile the program with profiling information', 0), PathVariable('PREFIX', 'Compile the program with PREFIX as the root for installation', '/usr/local', PathVariable.PathIsDir), ('FAKE_ROOT', 'Make scons install the program under a fake root', '') -@@ -131,7 +131,10 @@ +@@ -131,7 +132,10 @@ if os.environ.has_key('CC'): env['CC'] = os.environ['CC'] if os.environ.has_key('CXXFLAGS'): @@ -29,7 +29,7 @@ if os.environ.has_key('LDFLAGS'): env['LINKFLAGS'] = os.environ['LDFLAGS'].split() -@@ -139,6 +140,12 @@ +@@ -139,6 +143,12 @@ if os.environ.has_key('LDFLAGS'): if os.environ.has_key('CFLAGS'): env['CFLAGS'] = os.environ['CFLAGS'].split() @@ -42,7 +42,14 @@ env['CPPDEFINES'] = [] # Initialize as a list so Append doesn't concat strings env.SConsignFile('build/sconf/.sconsign') -@@ -263,14 +270,15 @@ +@@ -256,21 +266,20 @@ if not 'install' in COMMAND_LINE_TARGETS + + if not conf.CheckHeader('iconv.h'): + Exit(1) +- elif conf.CheckLibWithHeader('iconv', 'iconv.h', 'c', 'iconv(0, (const char **)0, 0, (char**)0, 0);'): +- conf.env.Append(CPPDEFINES = ('ICONV_CONST', 'const')) + + if conf.CheckHeader(['sys/types.h', 'sys/socket.h', 'ifaddrs.h', 'net/if.h']): conf.env.Append(CPPDEFINES = 'HAVE_IFADDRS_H') # TODO: Implement a plugin system so libnotify doesn't have compile-time dependencies @@ -65,3 +72,4 @@ + conf.env.Append(CPPDEFINES = 'HAVE_LIBNOTIFY_0_7') conf.CheckBZRRevision() + |