ultrabug    15/03/17 13:45:06

  Added:                mongodb.conf-r3 mongodb-3.0.0-fix-scons.patch
  Log:
  version bump, fix #540460
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
B658FA13)

Revision  Changes    Path
1.1                  dev-db/mongodb/files/mongodb.conf-r3

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/files/mongodb.conf-r3?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/files/mongodb.conf-r3?rev=1.1&content-type=text/plain

Index: mongodb.conf-r3
===================================================================
# !! IMPORTANT !!
#
# This file uses the YAML format as described in the documentation:
#   http://docs.mongodb.org/manual/reference/configuration-options/

storage:
    dbPath: "/var/lib/mongodb"
    #engine: wiredTiger

systemLog:
    destination: file
    path: "/var/log/mongodb/mongodb.log"
    quiet: true
    logAppend: true

net:
    port: 27017
    bindIp: 127.0.0.1
    #ssl:
    #    mode: disabled

#security:
    #keyFile:
    #clusterAuthMode:

#replication:
    #replSetName:

# Specifies one of the MongoDB parameters described here:
#   http://docs.mongodb.org/manual/reference/parameters/
#
# You can specify multiple setParameter fields such as:
#   setParameter: {enableTestCommands: 1}
#setParameter:



1.1                  dev-db/mongodb/files/mongodb-3.0.0-fix-scons.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/files/mongodb-3.0.0-fix-scons.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mongodb/files/mongodb-3.0.0-fix-scons.patch?rev=1.1&content-type=text/plain

Index: mongodb-3.0.0-fix-scons.patch
===================================================================
--- SConstruct.orig     2015-02-05 16:33:41.000000000 +0000
+++ SConstruct  2015-02-18 08:21:23.120134258 +0000
@@ -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'):




Reply via email to