| 1 |
ultrabug 12/08/30 10:14:54 |
| 2 |
|
| 3 |
Added: mongodb-2.2-fix-sconscript.patch |
| 4 |
mongodb-2.2-fix-scons.patch |
| 5 |
Log: |
| 6 |
Version bump, drop old. |
| 7 |
|
| 8 |
(Portage version: 2.1.11.11/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: mongodb-2.2-fix-sconscript.patch |
| 17 |
=================================================================== |
| 18 |
--- a/src/mongo/SConscript 2012-08-29 16:21:35.077094498 +0200 |
| 19 |
+++ b/src/mongo/SConscript 2012-08-29 17:13:55.199620421 +0200 |
| 20 |
@@ -170,7 +170,7 @@ |
| 21 |
|
| 22 |
if usesm: |
| 23 |
env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_spidermonkey.cpp'], |
| 24 |
- LIBDEPS=['$BUILD_DIR/third_party/js-1.7/js', 'bson_template_evaluator']) |
| 25 |
+ LIBDEPS=['bson_template_evaluator']) |
| 26 |
elif usev8: |
| 27 |
env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_v8.cpp', |
| 28 |
'scripting/v8_db.cpp', |
| 29 |
|
| 30 |
|
| 31 |
|
| 32 |
1.1 dev-db/mongodb/files/mongodb-2.2-fix-scons.patch |
| 33 |
|
| 34 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/files/mongodb-2.2-fix-scons.patch?rev=1.1&view=markup |
| 35 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/files/mongodb-2.2-fix-scons.patch?rev=1.1&content-type=text/plain |
| 36 |
|
| 37 |
Index: mongodb-2.2-fix-scons.patch |
| 38 |
=================================================================== |
| 39 |
--- a/SConstruct 2012-08-29 16:21:35.107094792 +0200 |
| 40 |
+++ b/SConstruct 2012-08-29 19:09:16.964893217 +0200 |
| 41 |
@@ -677,7 +677,6 @@ |
| 42 |
# -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used. |
| 43 |
env.Append( CCFLAGS=["-fPIC", |
| 44 |
"-fno-strict-aliasing", |
| 45 |
- "-ggdb", |
| 46 |
"-pthread", |
| 47 |
"-Wall", |
| 48 |
"-Wsign-compare", |
| 49 |
@@ -685,14 +684,15 @@ |
| 50 |
"-Winvalid-pch"] ) |
| 51 |
# env.Append( " -Wconversion" ) TODO: this doesn't really work yet |
| 52 |
if linux: |
| 53 |
- env.Append( CCFLAGS=["-Werror", "-pipe"] ) |
| 54 |
+ env.Append( CPPDEFINES=["XP_UNIX=1"] ) |
| 55 |
if not has_option('clang'): |
| 56 |
env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's |
| 57 |
|
| 58 |
env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] ) |
| 59 |
- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] ) |
| 60 |
+ env.Append( CXXFLAGS=os.environ['CXXFLAGS']) |
| 61 |
+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] ) |
| 62 |
env.Append( LINKFLAGS=["-fPIC", "-pthread", "-rdynamic"] ) |
| 63 |
- env.Append( LIBS=[] ) |
| 64 |
+ env.Append( LIBS=['js', 'pcre', 'pcrecpp', 'snappy'] ) |
| 65 |
|
| 66 |
#make scons colorgcc friendly |
| 67 |
for key in ('HOME', 'TERM'): |
| 68 |
@@ -703,6 +703,7 @@ |
| 69 |
|
| 70 |
if linux and has_option( "sharedclient" ): |
| 71 |
env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " ) |
| 72 |
+ env.Append( SHLINKFLAGS=" -Wl,-soname=libmongoclient.so " ) |
| 73 |
|
| 74 |
if linux and has_option( "gcov" ): |
| 75 |
env.Append( CXXFLAGS=" -fprofile-arcs -ftest-coverage " ) |
| 76 |
@@ -712,7 +713,7 @@ |
| 77 |
env.Append( CCFLAGS=["-O0", "-fstack-protector"] ) |
| 78 |
env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind |
| 79 |
else: |
| 80 |
- env.Append( CCFLAGS=["-O3"] ) |
| 81 |
+ env.Append( CXXFLAGS=["-O3"] ) |
| 82 |
|
| 83 |
if debugLogging: |
| 84 |
env.Append( CPPDEFINES=["_DEBUG"] ); |
Archives