forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev-db/mongodb: fix building with newer glibc/pcre.
Gentoo-Bug: https://bugs.gentoo.org/631688 Package-Manager: Portage-2.3.10, Repoman-2.3.3 Closes: gentoo#5764
- Loading branch information
1 parent
56ca3d6
commit 090527c
Showing
4 changed files
with
197 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| diff --git a/SConstruct b/SConstruct | ||
| --- a/SConstruct | ||
| +++ b/SConstruct | ||
| @@ -1008,7 +1008,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", | ||
| @@ -1016,13 +1015,13 @@ | ||
| "-Winvalid-pch"] ) | ||
| # env.Append( " -Wconversion" ) TODO: this doesn't really work yet | ||
| if linux or darwin: | ||
| - env.Append( CCFLAGS=["-pipe"] ) | ||
| if not has_option("disable-warnings-as-errors"): | ||
| env.Append( CCFLAGS=["-Werror"] ) | ||
|
|
||
| env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] ) | ||
| - env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] ) | ||
| env.Append( LINKFLAGS=["-fPIC", "-pthread"] ) | ||
| + env.Append( CXXFLAGS=os.environ['CXXFLAGS'] ) | ||
| + env.Append( LINKFLAGS=os.environ['LDFLAGS'] ) | ||
|
|
||
| # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program | ||
| # startup. | ||
| @@ -1039,7 +1038,7 @@ | ||
| if not darwin: | ||
| env.Append( LINKFLAGS=["-rdynamic"] ) | ||
|
|
||
| - env.Append( LIBS=[] ) | ||
| + env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] ) | ||
|
|
||
| #make scons colorgcc friendly | ||
| for key in ('HOME', 'TERM'): |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| --- a/src/mongo/shell/bench.cpp 2017-09-20 19:12:20.893056990 +0200 | ||
| +++ b/src/mongo/shell/bench.cpp 2017-09-20 19:14:08.165060566 +0200 | ||
| @@ -52,6 +52,9 @@ | ||
| #include "mongo/util/time_support.h" | ||
| #include "mongo/util/version.h" | ||
|
|
||
| +#include <string> | ||
| +using namespace std; | ||
| + | ||
| // --------------------------------- | ||
| // ---- benchmarking system -------- | ||
| // --------------------------------- | ||
| --- a/src/mongo/db/dbwebserver.cpp 2017-09-20 19:24:50.042081961 +0200 | ||
| +++ b/src/mongo/db/dbwebserver.cpp 2017-09-20 19:26:20.240084968 +0200 | ||
| @@ -58,6 +58,8 @@ | ||
| #include "mongo/util/ramlog.h" | ||
| #include "mongo/util/version.h" | ||
|
|
||
| +#include <string> | ||
| +using namespace std; | ||
|
|
||
| namespace mongo { | ||
|
|
||
| --- a/src/mongo/db/matcher/expression_leaf.cpp 2017-09-20 19:27:59.009088260 +0200 | ||
| +++ b/src/mongo/db/matcher/expression_leaf.cpp 2017-09-20 19:28:31.082089329 +0200 | ||
| @@ -39,6 +39,9 @@ | ||
| #include "mongo/db/jsobj.h" | ||
| #include "mongo/db/matcher/path.h" | ||
|
|
||
| +#include <string> | ||
| +using namespace std; | ||
| + | ||
| namespace mongo { | ||
|
|
||
| Status LeafMatchExpression::initPath(const StringData& path) { | ||
| --- a/src/mongo/db/repl/master_slave.cpp 2017-09-20 19:30:04.569092445 +0200 | ||
| +++ b/src/mongo/db/repl/master_slave.cpp 2017-09-20 19:31:19.145094931 +0200 | ||
| @@ -70,6 +70,9 @@ | ||
| #include "mongo/util/exit.h" | ||
| #include "mongo/util/log.h" | ||
|
|
||
| +#include <string> | ||
| +using namespace std; | ||
| + | ||
| using boost::scoped_ptr; | ||
| using std::auto_ptr; | ||
| using std::cout; | ||
| --- a/src/mongo/util/net/miniwebserver.cpp 2017-09-20 19:32:55.368098138 +0200 | ||
| +++ b/src/mongo/util/net/miniwebserver.cpp 2017-09-20 19:33:57.128100197 +0200 | ||
| @@ -39,6 +39,9 @@ | ||
| #include "mongo/util/hex.h" | ||
| #include "mongo/util/log.h" | ||
|
|
||
| +#include <string> | ||
| +using namespace std; | ||
| + | ||
| namespace mongo { | ||
|
|
||
| using boost::shared_ptr; | ||
| --- a/src/mongo/s/config.cpp 2017-09-20 19:42:45.614117812 +0200 | ||
| +++ b/src/mongo/s/config.cpp 2017-09-20 19:43:28.278119234 +0200 | ||
| @@ -60,6 +60,9 @@ | ||
| #include "mongo/util/net/message.h" | ||
| #include "mongo/util/stringutils.h" | ||
|
|
||
| +#include <string> | ||
| +using namespace std; | ||
| + | ||
| namespace mongo { | ||
|
|
||
| using boost::scoped_ptr; | ||
| --- a/src/mongo/s/grid.cpp 2017-09-20 19:51:07.684134547 +0200 | ||
| +++ b/src/mongo/s/grid.cpp 2017-09-20 19:51:43.436135739 +0200 | ||
| @@ -55,6 +55,9 @@ | ||
| #include "mongo/util/startup_test.h" | ||
| #include "mongo/util/stringutils.h" | ||
|
|
||
| +#include <string> | ||
| +using namespace std; | ||
| + | ||
| namespace mongo { | ||
|
|
||
| using std::endl; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters