diff options
| author | Michał Górny <mgorny@gentoo.org> | 2016-01-01 10:36:29 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2016-01-01 10:37:28 +0100 |
| commit | cad1e743614674af89fc9fced03594bcab6f20a3 (patch) | |
| tree | 5620ba657ee43ce41d6502f97d398e9fb9f1460f | |
| parent | 52e99ad8745af634ced0e18fdf76410d14a0233d (diff) | |
| download | gentoo-cad1e743614674af89fc9fced03594bcab6f20a3.tar.gz gentoo-cad1e743614674af89fc9fced03594bcab6f20a3.tar.xz | |
dev-db/mongodb: [QA] Make SCons respect PATH, #570436
| -rw-r--r-- | dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch index 1eb79d13980..8b29bd4a2a4 100644 --- a/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch +++ b/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch @@ -1,6 +1,17 @@ ---- 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?= <mgorny@gentoo.org> +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", @@ -8,7 +19,7 @@ "-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 + |