diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2013-06-11 08:20:34 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-06-11 08:20:49 +0000 |
commit | 5212570b3d01388b221efe65d6749837a95359f1 (patch) | |
tree | 5a5c51c5cf21c574f2393b203c6592318643a510 /testing/mongodb/mongodb-2.2-r1-fix-scons.patch | |
parent | 26c4e189e825d62d0249fb5f499bcb545d40e1ab (diff) | |
download | aports-5212570b3d01388b221efe65d6749837a95359f1.tar.bz2 aports-5212570b3d01388b221efe65d6749837a95359f1.tar.xz |
testing/mongodb: new aport
High-performance, schema-free document-oriented database
http://www.mongodb.org
ref #1182
Diffstat (limited to 'testing/mongodb/mongodb-2.2-r1-fix-scons.patch')
-rw-r--r-- | testing/mongodb/mongodb-2.2-r1-fix-scons.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/testing/mongodb/mongodb-2.2-r1-fix-scons.patch b/testing/mongodb/mongodb-2.2-r1-fix-scons.patch new file mode 100644 index 000000000..2d08fb454 --- /dev/null +++ b/testing/mongodb/mongodb-2.2-r1-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=['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"] ); |