ultrabug 15/03/23 09:51:59 Added: mongo-cxx-driver-26compat-fix-scons.patch Log: 26compat branch ebuild wrt #518104 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
Revision Changes Path 1.1 dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-26compat-fix-scons.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-26compat-fix-scons.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-26compat-fix-scons.patch?rev=1.1&content-type=text/plain Index: mongo-cxx-driver-26compat-fix-scons.patch =================================================================== --- a/SConstruct 2015-03-23 10:36:42.328921927 +0100 +++ b/SConstruct 2015-03-23 10:37:37.599310414 +0100 @@ -828,7 +828,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", @@ -836,13 +835,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. @@ -938,7 +937,6 @@ if not use_system_version_of_library("snappy"): env.Prepend(CPPPATH=['$BUILD_DIR/third_party/snappy']) -env.Prepend(CPPPATH=['$BUILD_DIR/third_party/gtest-1.7.0/include']) env.Append( CPPPATH=['$EXTRACPPPATH'], LIBPATH=['$EXTRALIBPATH'] )
