You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
61 lines
1.8 KiB
61 lines
1.8 KiB
16 years ago
|
Index: SConstruct
|
||
|
|
--- SConstruct.orig 2010-07-24 17:37:00.000000000 +0200
|
||
|
|
+++ SConstruct 2010-07-28 18:18:31.000000000 +0200
|
||
|
|
@@ -321,6 +321,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" ] )
|
||
|
|
@@ -738,7 +740,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" );
|
||
|
|
@@ -991,11 +993,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-24 17:37:00.000000000 +0200
|
||
|
|
+++ distsrc/client/SConstruct 2010-07-28 18:18:38.000000000 +0200
|
||
|
|
@@ -33,7 +33,7 @@
|
||
|
|
nix = True
|
||
|
|
|
||
|
|
if nix:
|
||
|
|
- env.Append( CPPFLAGS=" -O3" )
|
||
|
|
+ env.Append( CPPFLAGS=" -O2" )
|
||
|
|
|
||
|
|
boostLibs = [ "thread" , "filesystem" , "system" ]
|
||
|
|
env.Prepend( LIBS =["boost_%s-mt"%(lib) for lib in boostLibs ] )
|
||
|
|
Index: scripting/engine_spidermonkey.h
|
||
|
|
--- scripting/engine_spidermonkey.h.orig 2010-07-24 17:37:00.000000000 +0200
|
||
|
|
+++ scripting/engine_spidermonkey.h 2010-07-28 18:18:11.000000000 +0200
|
||
|
|
@@ -64,9 +64,11 @@
|
||
|
|
|
||
|
|
#define JSCLASS_GLOBAL_FLAGS 0
|
||
|
|
|
||
|
|
+#if 0
|
||
|
|
JSBool JS_CStringsAreUTF8(){
|
||
|
|
return false;
|
||
|
|
}
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
#define SM16
|
||
|
|
|