|
|
|
|
Index: SConstruct
|
|
|
|
|
--- SConstruct.orig 2010-07-30 22:22:38.000000000 +0200
|
|
|
|
|
+++ SConstruct 2010-07-31 11:02:31.000000000 +0200
|
|
|
|
|
@@ -326,6 +326,8 @@
|
|
|
|
|
env.Append( CPPDEFINES=[ "_SCONS" , "MONGO_EXPOSE_MACROS" ] )
|
|
|
|
|
env.Append( CPPPATH=[ "." ] )
|
|
|
|
|
|
|
|
|
|
+env.Append( CPPPATH=[ "@l_prefix@/include" ] )
|
|
|
|
|
+env.Append( LIBPATH=[ "@l_prefix@/lib" ] )
|
|
|
|
|
|
|
|
|
|
if GetOption( "safeshell" ) != None:
|
|
|
|
|
env.Append( CPPDEFINES=[ "MONGO_SAFE_SHELL" ] )
|
|
|
|
|
@@ -755,7 +757,7 @@
|
|
|
|
|
env.Append( CPPFLAGS=" -O0 -fstack-protector " );
|
|
|
|
|
env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
|
|
|
|
|
else:
|
|
|
|
|
- env.Append( CPPFLAGS=" -O3" )
|
|
|
|
|
+ env.Append( CPPFLAGS=" -O2" )
|
|
|
|
|
|
|
|
|
|
if debugLogging:
|
|
|
|
|
env.Append( CPPFLAGS=" -D_DEBUG" );
|
|
|
|
|
@@ -1008,11 +1010,6 @@
|
|
|
|
|
if linux:
|
|
|
|
|
myCheckLib( "rt" , True )
|
|
|
|
|
|
|
|
|
|
- # requires ports devel/libexecinfo to be installed
|
|
|
|
|
- if freebsd or openbsd:
|
|
|
|
|
- myCheckLib( "execinfo", True )
|
|
|
|
|
- env.Append( LIBS=[ "execinfo" ] )
|
|
|
|
|
-
|
|
|
|
|
# Handle staticlib,staticlibpath options.
|
|
|
|
|
staticlibfiles = []
|
|
|
|
|
if GetOption( "staticlib" ) is not None:
|
|
|
|
|
Index: distsrc/client/SConstruct
|
|
|
|
|
--- distsrc/client/SConstruct.orig 2010-07-30 22:22:38.000000000 +0200
|
|
|
|
|
+++ distsrc/client/SConstruct 2010-07-31 12:26:30.000000000 +0200
|
|
|
|
|
@@ -35,7 +35,7 @@
|
|
|
|
|
linux = True
|
|
|
|
|
|
|
|
|
|
if nix:
|
|
|
|
|
- env.Append( CPPFLAGS=" -O3" )
|
|
|
|
|
+ env.Append( CPPFLAGS=" -O2" )
|
|
|
|
|
if linux:
|
|
|
|
|
env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
|
|
|
|
|
|
|
|
|
|
Index: scripting/engine_spidermonkey.h
|
|
|
|
|
--- scripting/engine_spidermonkey.h.orig 2010-07-30 22:22:38.000000000 +0200
|
|
|
|
|
+++ scripting/engine_spidermonkey.h 2010-07-31 11:02:31.000000000 +0200
|
|
|
|
|
@@ -64,9 +64,11 @@
|
|
|
|
|
|
|
|
|
|
#define JSCLASS_GLOBAL_FLAGS 0
|
|
|
|
|
|
|
|
|
|
+#if 0
|
|
|
|
|
JSBool JS_CStringsAreUTF8(){
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
#define SM16
|
|
|
|
|
|