Skip to content

Commit

Permalink
dev-db/mongodb: [QA] Make SCons respect PATH, #570436
Browse files Browse the repository at this point in the history
  • Loading branch information
mgorny committed Jan 1, 2016
1 parent 52e99ad commit cad1e74
Showing 1 changed file with 26 additions and 7 deletions.
33 changes: 26 additions & 7 deletions dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
--- a/SConstruct 2015-12-02 20:01:34.000000000 +0100
+++ b/SConstruct 2015-12-27 17:06:45.563739544 +0100
@@ -1371,7 +1371,6 @@
From ab6f929ee4584f3f1a040e55a63f493603f228d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]>
Date: Fri, 1 Jan 2016 10:27:35 +0100
Subject: [PATCH] Fix build for Gentoo

---
SConstruct | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/SConstruct b/SConstruct
index 64c8387..fa9ab8b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1371,7 +1371,6 @@ if env.TargetOSIs('posix'):
env.Append( CCFLAGS=["-fno-omit-frame-pointer",
"-fPIC",
"-fno-strict-aliasing",
- "-ggdb",
"-pthread",
"-Wall",
"-Wsign-compare",
@@ -1382,8 +1381,9 @@
@@ -1382,8 +1381,9 @@ if env.TargetOSIs('posix'):
if not has_option("disable-warnings-as-errors"):
env.Append( CCFLAGS=["-Werror"] )

Expand All @@ -19,12 +30,20 @@

# SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
# startup.
@@ -1398,7 +1398,7 @@
@@ -1398,10 +1398,10 @@ if env.TargetOSIs('posix'):
env.Append( SHLINKFLAGS=["-Wl,-z,now"] )
env.Append( LINKFLAGS=["-rdynamic"] )

- env.Append( LIBS=[] )
+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )

#make scons colorgcc friendly
for key in ('HOME', 'TERM'):
- #make scons colorgcc friendly
- for key in ('HOME', 'TERM'):
+ #make scons colorgcc, distcc, ccache friendly
+ for key in ('HOME', 'PATH', 'TERM'):
try:
env['ENV'][key] = os.environ[key]
except KeyError:
--
2.6.4

0 comments on commit cad1e74

Please sign in to comment.