forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev-db/mongodb: [QA] Make SCons respect PATH, #570436
- Loading branch information
Showing
1 changed file
with
26 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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"] ) | ||
|
||
|
@@ -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 | ||
|