| 1 |
commit: 9ef71bd8c965fe26ba310494a615fb8835be12a4 |
| 2 |
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Jan 9 10:30:26 2018 +0000 |
| 4 |
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 11 11:34:12 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ef71bd8 |
| 7 |
|
| 8 |
dev-db/mongodb: reintroduce scons fixes |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/643984 |
| 11 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/6804 |
| 13 |
|
| 14 |
dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch | 32 ++++++++++++++++++++++ |
| 15 |
...ongodb-3.6.1.ebuild => mongodb-3.6.1-r1.ebuild} | 1 + |
| 16 |
2 files changed, 33 insertions(+) |
| 17 |
|
| 18 |
diff --git a/dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..d7bfb35b00d |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch |
| 23 |
@@ -0,0 +1,32 @@ |
| 24 |
+diff --git a/SConstruct b/SConstruct |
| 25 |
+index fe7975b..92659a7 100644 |
| 26 |
+--- a/SConstruct |
| 27 |
++++ b/SConstruct |
| 28 |
+@@ -1619,7 +1619,6 @@ if env.TargetOSIs('posix'): |
| 29 |
+ # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used. |
| 30 |
+ env.Append( CCFLAGS=["-fno-omit-frame-pointer", |
| 31 |
+ "-fno-strict-aliasing", |
| 32 |
+- "-ggdb", |
| 33 |
+ "-pthread", |
| 34 |
+ "-Wall", |
| 35 |
+ "-Wsign-compare", |
| 36 |
+@@ -1631,6 +1630,8 @@ if env.TargetOSIs('posix'): |
| 37 |
+ env.Append( CCFLAGS=["-Werror"] ) |
| 38 |
+ |
| 39 |
+ env.Append( CXXFLAGS=["-Woverloaded-virtual"] ) |
| 40 |
++ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] ) |
| 41 |
++ env.Append( LINKFLAGS=os.environ['LDFLAGS'] ) |
| 42 |
+ if env.ToolchainIs('clang'): |
| 43 |
+ env.Append( CXXFLAGS=['-Werror=unused-result'] ) |
| 44 |
+ |
| 45 |
+@@ -1650,8 +1651,8 @@ if env.TargetOSIs('posix'): |
| 46 |
+ |
| 47 |
+ env.Append( LIBS=[] ) |
| 48 |
+ |
| 49 |
+- #make scons colorgcc friendly |
| 50 |
+- for key in ('HOME', 'TERM'): |
| 51 |
++ #make scons colorgcc, distcc, ccache friendly |
| 52 |
++ for key in ('HOME', 'PATH', 'TERM'): |
| 53 |
+ try: |
| 54 |
+ env['ENV'][key] = os.environ[key] |
| 55 |
+ except KeyError: |
| 56 |
|
| 57 |
diff --git a/dev-db/mongodb/mongodb-3.6.1.ebuild b/dev-db/mongodb/mongodb-3.6.1-r1.ebuild |
| 58 |
similarity index 99% |
| 59 |
rename from dev-db/mongodb/mongodb-3.6.1.ebuild |
| 60 |
rename to dev-db/mongodb/mongodb-3.6.1-r1.ebuild |
| 61 |
index 363620ef050..8291fe7fc50 100644 |
| 62 |
--- a/dev-db/mongodb/mongodb-3.6.1.ebuild |
| 63 |
+++ b/dev-db/mongodb/mongodb-3.6.1-r1.ebuild |
| 64 |
@@ -52,6 +52,7 @@ PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )" |
| 65 |
|
| 66 |
PATCHES=( |
| 67 |
"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch" |
| 68 |
+ "${FILESDIR}/${PN}-3.6.1-fix-scons.patch" |
| 69 |
"${FILESDIR}/${PN}-3.6.1-no-compass.patch" |
| 70 |
) |
Archives