summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexys Jacob <ultrabug@gentoo.org>2019-08-09 09:15:47 +0200
committerAlexys Jacob <ultrabug@gentoo.org>2019-08-09 09:28:03 +0200
commit3004e2571a7b08d15e41e149e15fd50f818b78df (patch)
treeed860bc3d8f38bc8c8a93acd127a6ac3d4d69ad5 /dev-db/mongodb/files
parentapp-admin/mongo-tools: drop soon to EOL 3.4 (diff)
downloadgentoo-3004e2571a7b08d15e41e149e15fd50f818b78df.tar.gz
gentoo-3004e2571a7b08d15e41e149e15fd50f818b78df.tar.bz2
gentoo-3004e2571a7b08d15e41e149e15fd50f818b78df.zip
dev-db/mongodb: drop soon to EOL 3.4
Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
Diffstat (limited to 'dev-db/mongodb/files')
-rw-r--r--dev-db/mongodb/files/mongodb-3.4.0-fix-scons.patch35
-rw-r--r--dev-db/mongodb/files/mongodb-3.4.6-sysmacros-include.patch38
2 files changed, 0 insertions, 73 deletions
diff --git a/dev-db/mongodb/files/mongodb-3.4.0-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.4.0-fix-scons.patch
deleted file mode 100644
index 2dd751fad813..000000000000
--- a/dev-db/mongodb/files/mongodb-3.4.0-fix-scons.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/SConstruct 2016-12-27 11:10:06.801949538 +0100
-+++ b/SConstruct 2016-12-27 11:12:40.426407713 +0100
-@@ -1557,7 +1557,6 @@
- # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
- env.Append( CCFLAGS=["-fno-omit-frame-pointer",
- "-fno-strict-aliasing",
-- "-ggdb",
- "-pthread",
- "-Wall",
- "-Wsign-compare",
-@@ -1568,8 +1567,9 @@
- if not has_option("disable-warnings-as-errors"):
- env.Append( CCFLAGS=["-Werror"] )
-
-- env.Append( CXXFLAGS=["-Woverloaded-virtual"] )
- env.Append( LINKFLAGS=["-pthread"] )
-+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
-+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
-
- # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
- # startup.
-@@ -1579,10 +1579,10 @@
- env.Append( LINKFLAGS=["-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, distcc, ccache friendly
-+ for key in ('HOME', 'PATH', 'TERM'):
- try:
- env['ENV'][key] = os.environ[key]
- except KeyError:
diff --git a/dev-db/mongodb/files/mongodb-3.4.6-sysmacros-include.patch b/dev-db/mongodb/files/mongodb-3.4.6-sysmacros-include.patch
deleted file mode 100644
index 868ba73e4421..000000000000
--- a/dev-db/mongodb/files/mongodb-3.4.6-sysmacros-include.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e245cac2b3c18015dee8caddd449532785d15c2b Mon Sep 17 00:00:00 2001
-From: Jason Carey <jcarey@argv.me>
-Date: Mon, 26 Jun 2017 11:09:10 -0400
-Subject: [PATCH] SERVER-29855 Pull major/minor from sys/sysmacros.h
-
-Per newer versions of glibc:
-
-----
-error: In the GNU C Library, "major" is defined
- by <sys/sysmacros.h>. For historical compatibility, it is
- currently defined by <sys/types.h> as well, but we plan to
- remove this soon. To use "major", include <sys/sysmacros.h>
- directly. If you did not intend to use a system-defined macro
- "major", you should undefine it after including <sys/types.h>. [-Werror]
- string path = str::stream() << "/sys/dev/block/" << major(dev) << ':' << minor(dev)
-----
-
-Including <sys/sysmacros.h> appears to be the correct solution to quiet
-the warning
----
- src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp b/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp
-index 5a784b25dc7..c43e148d3f4 100644
---- a/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp
-+++ b/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp
-@@ -36,6 +36,10 @@
- #include <boost/filesystem/path.hpp>
- #include <fstream>
-
-+#ifdef __linux__
-+#include <sys/sysmacros.h>
-+#endif
-+
- #include "mongo/db/mongod_options.h"
- #include "mongo/db/storage/mmap_v1/data_file_sync.h"
- #include "mongo/db/storage/mmap_v1/dur.h"