projects / packages / mongodb.git / blame
| Commit | Line | Data |
|---|---|---|
| 04298a8b JB |
1 | --- mongodb-src-r2.0.1/SConstruct.orig 2011-10-22 02:52:16.000000000 +0200 |
| 2 | +++ mongodb-src-r2.0.1/SConstruct 2011-11-01 19:46:50.060469479 +0100 | |
| 3 | @@ -673,7 +673,6 @@ | |
| 105f2c53 PZ |
4 | env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" ) |
| 5 | # env.Append( " -Wconversion" ) TODO: this doesn't really work yet | |
| 6 | if linux: | |
| 7 | - env.Append( CPPFLAGS=" -Werror " ) | |
| 04298a8b JB |
8 | if not has_option('clang'): |
| 9 | env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's | |
| 10 | ||
| 11 | @@ -684,7 +683,8 @@ | |
| 105f2c53 PZ |
12 | |
| 13 | #make scons colorgcc friendly | |
| 14 | env['ENV']['HOME'] = os.environ['HOME'] | |
| 15 | - env['ENV']['TERM'] = os.environ['TERM'] | |
| 16 | + if 'TERM' in os.environ: | |
| 17 | + env['ENV']['TERM'] = os.environ['TERM'] | |
| 18 | ||
| 19 | if linux and has_option( "sharedclient" ): | |
| 20 | env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " ) | |
| 04298a8b JB |
21 | @@ -732,10 +732,6 @@ |
| 22 | print( "removing precompiled headers" ) | |
| 23 | os.unlink('pch.h.gch') # gcc uses the file if it exists | |
| 24 | ||
| 25 | -if usev8: | |
| 26 | - env.Prepend( CPPPATH=["../v8/include/"] ) | |
| 27 | - env.Prepend( LIBPATH=["../v8/"] ) | |
| 28 | - | |
| 29 | if "uname" in dir(os): | |
| 30 | hacks = buildscripts.findHacks( os.uname() ) | |
| 31 | if hacks is not None: | |
| 32 | @@ -919,6 +915,10 @@ | |
| 33 | else: | |
| 34 | myCheckLib( "v8" , True ) | |
| 35 | ||
| 36 | + myCheckLib(["pcrecpp"], True) | |
| 37 | + myCheckLib(["pcre"], True) | |
| 38 | + myCheckLib(["snappy"], True) | |
| 39 | + | |
| 40 | # requires ports devel/libexecinfo to be installed | |
| 41 | if freebsd or openbsd: | |
| 42 | myCheckLib( "execinfo", True ) |