diff options
| author |   Alexys Jacob <ultrabug@gentoo.org> | 2012-08-30 10:14:54 +0000 |
|---|---|---|
| committer | Alexys Jacob <ultrabug@gentoo.org> | 2012-08-30 10:14:54 +0000 |
| commit | e78abe03f8f4bb037f0d06fa7e16bbaccccd16b1 (patch) | |
| tree | 0d53fdb98dc20b604f48ec1f4a8b47f2c62e6d87 /dev-db/mongodb/files | |
| parent | Clear out unrequired die statements from EAPI4 ebuild (minor cleanup, related... (diff) | |
| download | gentoo-2-e78abe03f8f4bb037f0d06fa7e16bbaccccd16b1.tar.gz gentoo-2-e78abe03f8f4bb037f0d06fa7e16bbaccccd16b1.tar.bz2 gentoo-2-e78abe03f8f4bb037f0d06fa7e16bbaccccd16b1.zip | |
Version bump, drop old.
(Portage version: 2.1.11.11/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/mongodb/files')
| -rw-r--r-- | dev-db/mongodb/files/mongodb-2.2-fix-scons.patch | 46 | ||||
| -rw-r--r-- | dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch | 11 |
2 files changed, 57 insertions, 0 deletions
diff --git a/dev-db/mongodb/files/mongodb-2.2-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.2-fix-scons.patch new file mode 100644 index 000000000000..2d29d1e3faee --- /dev/null +++ b/dev-db/mongodb/files/mongodb-2.2-fix-scons.patch @@ -0,0 +1,46 @@ +--- a/SConstruct 2012-08-29 16:21:35.107094792 +0200 ++++ b/SConstruct 2012-08-29 19:09:16.964893217 +0200 +@@ -677,7 +677,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", +- "-ggdb", + "-pthread", + "-Wall", + "-Wsign-compare", +@@ -685,14 +684,15 @@ + "-Winvalid-pch"] ) + # env.Append( " -Wconversion" ) TODO: this doesn't really work yet + if linux: +- env.Append( CCFLAGS=["-Werror", "-pipe"] ) ++ env.Append( CPPDEFINES=["XP_UNIX=1"] ) + if not has_option('clang'): + 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( LINKFLAGS=os.environ['LDFLAGS'] ) + env.Append( LINKFLAGS=["-fPIC", "-pthread", "-rdynamic"] ) +- env.Append( LIBS=[] ) ++ env.Append( LIBS=['js', 'pcre', 'pcrecpp', 'snappy'] ) + + #make scons colorgcc friendly + for key in ('HOME', 'TERM'): +@@ -703,6 +703,7 @@ + + if linux and has_option( "sharedclient" ): + env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " ) ++ env.Append( SHLINKFLAGS=" -Wl,-soname=libmongoclient.so " ) + + if linux and has_option( "gcov" ): + env.Append( CXXFLAGS=" -fprofile-arcs -ftest-coverage " ) +@@ -712,7 +713,7 @@ + env.Append( CCFLAGS=["-O0", "-fstack-protector"] ) + env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind + else: +- env.Append( CCFLAGS=["-O3"] ) ++ env.Append( CXXFLAGS=["-O3"] ) + + if debugLogging: + env.Append( CPPDEFINES=["_DEBUG"] ); diff --git a/dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch b/dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch new file mode 100644 index 000000000000..43b9db6530dc --- /dev/null +++ b/dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch @@ -0,0 +1,11 @@ +--- a/src/mongo/SConscript 2012-08-29 16:21:35.077094498 +0200 ++++ b/src/mongo/SConscript 2012-08-29 17:13:55.199620421 +0200 +@@ -170,7 +170,7 @@ + + if usesm: + env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_spidermonkey.cpp'], +- LIBDEPS=['$BUILD_DIR/third_party/js-1.7/js', 'bson_template_evaluator']) ++ LIBDEPS=['bson_template_evaluator']) + elif usev8: + env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_v8.cpp', + 'scripting/v8_db.cpp', |