diff options
Diffstat (limited to 'database/mongodb/scons.patch')
| -rw-r--r-- | database/mongodb/scons.patch | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/database/mongodb/scons.patch b/database/mongodb/scons.patch index 94dbc05bee..e4edb15eff 100644 --- a/database/mongodb/scons.patch +++ b/database/mongodb/scons.patch @@ -1,6 +1,6 @@ ---- SConstruct.orig -+++ SConstruct -@@ -702,7 +702,6 @@ +--- SConstruct.orig 2014-08-22 01:56:32.000000000 +0400 ++++ SConstruct 2014-09-27 15:28:11.496080339 +0400 +@@ -704,7 +704,6 @@ # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used. env.Append( CCFLAGS=["-fPIC", "-fno-strict-aliasing", @@ -8,17 +8,12 @@ "-pthread", "-Wall", "-Wsign-compare", -@@ -710,14 +709,14 @@ - "-Winvalid-pch"] ) - # env.Append( " -Wconversion" ) TODO: this doesn't really work yet - if linux: -- env.Append( CCFLAGS=["-Werror", "-pipe"] ) - if not has_option('clang'): +@@ -719,9 +718,10 @@ env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] ) - env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] ) -+ env.Append( CXXFLAGS=os.environ['CXXFLAGS']) ++ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] ) + env.Append( LINKFLAGS=os.environ['LDFLAGS'] ) env.Append( LINKFLAGS=["-fPIC", "-pthread", "-rdynamic"] ) - env.Append( LIBS=[] ) @@ -26,3 +21,14 @@ #make scons colorgcc friendly for key in ('HOME', 'TERM'): +--- src/mongo/SConscript.orig 2014-08-22 01:56:32.000000000 +0400 ++++ src/mongo/SConscript 2014-09-27 18:24:40.903897125 +0400 +@@ -456,7 +456,7 @@ + env.Library('stacktrace', 'util/stacktrace.cpp') + + env.Program('lame_stacktrace_test', 'util/lame_stacktrace_test.cpp', +- LIBDEPS=['stacktrace', ++ LIBDEPS=['stacktrace', 'foundation', 'mongocommon', 'alltools', + '$BUILD_DIR/mongo/base/base']) + + serverOnlyFiles += mmapFiles |