| 1 |
commit: cad1e743614674af89fc9fced03594bcab6f20a3 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 1 09:36:29 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 1 09:37:28 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cad1e743 |
| 7 |
|
| 8 |
dev-db/mongodb: [QA] Make SCons respect PATH, #570436 |
| 9 |
|
| 10 |
dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch | 33 +++++++++++++++++----- |
| 11 |
1 file changed, 26 insertions(+), 7 deletions(-) |
| 12 |
|
| 13 |
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 |
| 14 |
index 1eb79d1..8b29bd4 100644 |
| 15 |
--- a/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch |
| 16 |
+++ b/dev-db/mongodb/files/mongodb-3.2.0-fix-scons.patch |
| 17 |
@@ -1,6 +1,17 @@ |
| 18 |
---- a/SConstruct 2015-12-02 20:01:34.000000000 +0100 |
| 19 |
-+++ b/SConstruct 2015-12-27 17:06:45.563739544 +0100 |
| 20 |
-@@ -1371,7 +1371,6 @@ |
| 21 |
+From ab6f929ee4584f3f1a040e55a63f493603f228d2 Mon Sep 17 00:00:00 2001 |
| 22 |
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 23 |
+Date: Fri, 1 Jan 2016 10:27:35 +0100 |
| 24 |
+Subject: [PATCH] Fix build for Gentoo |
| 25 |
+ |
| 26 |
+--- |
| 27 |
+ SConstruct | 10 +++++----- |
| 28 |
+ 1 file changed, 5 insertions(+), 5 deletions(-) |
| 29 |
+ |
| 30 |
+diff --git a/SConstruct b/SConstruct |
| 31 |
+index 64c8387..fa9ab8b 100644 |
| 32 |
+--- a/SConstruct |
| 33 |
++++ b/SConstruct |
| 34 |
+@@ -1371,7 +1371,6 @@ if env.TargetOSIs('posix'): |
| 35 |
env.Append( CCFLAGS=["-fno-omit-frame-pointer", |
| 36 |
"-fPIC", |
| 37 |
"-fno-strict-aliasing", |
| 38 |
@@ -8,7 +19,7 @@ |
| 39 |
"-pthread", |
| 40 |
"-Wall", |
| 41 |
"-Wsign-compare", |
| 42 |
-@@ -1382,8 +1381,9 @@ |
| 43 |
+@@ -1382,8 +1381,9 @@ if env.TargetOSIs('posix'): |
| 44 |
if not has_option("disable-warnings-as-errors"): |
| 45 |
env.Append( CCFLAGS=["-Werror"] ) |
| 46 |
|
| 47 |
@@ -19,12 +30,20 @@ |
| 48 |
|
| 49 |
# SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program |
| 50 |
# startup. |
| 51 |
-@@ -1398,7 +1398,7 @@ |
| 52 |
+@@ -1398,10 +1398,10 @@ if env.TargetOSIs('posix'): |
| 53 |
env.Append( SHLINKFLAGS=["-Wl,-z,now"] ) |
| 54 |
env.Append( LINKFLAGS=["-rdynamic"] ) |
| 55 |
|
| 56 |
- env.Append( LIBS=[] ) |
| 57 |
+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] ) |
| 58 |
|
| 59 |
- #make scons colorgcc friendly |
| 60 |
- for key in ('HOME', 'TERM'): |
| 61 |
+- #make scons colorgcc friendly |
| 62 |
+- for key in ('HOME', 'TERM'): |
| 63 |
++ #make scons colorgcc, distcc, ccache friendly |
| 64 |
++ for key in ('HOME', 'PATH', 'TERM'): |
| 65 |
+ try: |
| 66 |
+ env['ENV'][key] = os.environ[key] |
| 67 |
+ except KeyError: |
| 68 |
+-- |
| 69 |
+2.6.4 |
| 70 |
+ |
Archives