summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexys Jacob <ultrabug@gentoo.org>2011-04-15 07:51:06 +0000
committerAlexys Jacob <ultrabug@gentoo.org>2011-04-15 07:51:06 +0000
commitf9154d66b4e2b978f2c98900c1f652abe234a393 (patch)
tree8939d7bcb9104bb61a5c10d726f05e11f05c0491 /dev-db/mongodb/files
parentFix manifest, bug 363669 (diff)
downloadgentoo-2-f9154d66b4e2b978f2c98900c1f652abe234a393.tar.gz
gentoo-2-f9154d66b4e2b978f2c98900c1f652abe234a393.tar.bz2
gentoo-2-f9154d66b4e2b978f2c98900c1f652abe234a393.zip
improved CXX, remove ggdb flag, drop old
(Portage version: 2.1.9.45/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/mongodb/files')
-rw-r--r--dev-db/mongodb/files/mongodb-1.6-fix-scons.patch14
-rw-r--r--dev-db/mongodb/files/mongodb-1.8-fix-scons.patch12
2 files changed, 15 insertions, 11 deletions
diff --git a/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch
index 342c36f01595..64d562256272 100644
--- a/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch
+++ b/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch
@@ -1,13 +1,13 @@
-diff --git a/SConstruct b/SConstruct
-index e3046ff..529b19b 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -745,20 +745,19 @@ else:
+--- a/SConstruct 2011-04-13 19:09:56.774788380 +0200
++++ b/SConstruct 2011-04-13 19:15:50.874924566 +0200
+@@ -744,21 +744,20 @@
+ print( "No special config for [" + os.sys.platform + "] which probably means it won't work" )
if nix:
- env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
+- env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
- if linux:
- env.Append( CPPFLAGS=" -Werror " )
++ env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
@@ -26,7 +26,7 @@ index e3046ff..529b19b 100644
if debugLogging:
env.Append( CPPFLAGS=" -D_DEBUG" );
-@@ -972,8 +971,8 @@ def doConfigure( myenv , needPcre=True , shell=False ):
+@@ -972,8 +971,8 @@
myCheckLib( J , True )
mozHeader = "js"
diff --git a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
index 3d2996a35354..d16e233ed9c9 100644
--- a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
+++ b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
@@ -1,7 +1,11 @@
---- a/SConstruct 2011-04-06 06:40:13.000000000 +0200
-+++ b/SConstruct 2011-04-10 15:50:52.696516582 +0200
-@@ -671,9 +671,10 @@
- env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
+--- a/SConstruct 2011-04-13 18:25:01.436551679 +0200
++++ b/SConstruct 2011-04-13 18:25:45.387832601 +0200
+@@ -668,12 +668,13 @@
+ if has_option( "distcc" ):
+ env["CXX"] = "distcc " + env["CXX"]
+
+- env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
++ env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
# env.Append( " -Wconversion" ) TODO: this doesn't really work yet
if linux:
- env.Append( CPPFLAGS=" -Werror " )