mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
dev-db/mongodb: rebase boost 1.79 patch and split 1.85 patch in two to reuse it in 6
Signed-off-by: Robert Förster <Dessa@gmake.de> Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
committed by
Sam James
parent
42102058a4
commit
749ec8c1b8
@@ -37,8 +37,8 @@ https://bugs.gentoo.org/844235
|
||||
#include <boost/filesystem.hpp>
|
||||
+#include <boost/filesystem/fstream.hpp>
|
||||
#include <boost/filesystem/path.hpp>
|
||||
|
||||
#include "mongo/base/simple_string_data_comparator.h"
|
||||
#include <pcrecpp.h>
|
||||
|
||||
--- a/src/mongo/shell/shell_utils_extended.cpp
|
||||
+++ b/src/mongo/shell/shell_utils_extended.cpp
|
||||
@@ -37,6 +37,7 @@
|
||||
|
||||
16
dev-db/mongodb/files/mongodb-5.0.26-boost-1.85-extra.patch
Normal file
16
dev-db/mongodb/files/mongodb-5.0.26-boost-1.85-extra.patch
Normal file
@@ -0,0 +1,16 @@
|
||||
https://bugs.gentoo.org/932251
|
||||
https://github.com/mongodb/mongo/commit/f8e4be7f6da71f978b2aa9991febb4c7ad89c903#diff-010644a9158d28e5745762753c7ce454444c9fb9ab4c684e9f2fdcff50c6f539
|
||||
https://bugs.gentoo.org/932251#c3
|
||||
|
||||
--- a/src/mongo/db/initialize_server_global_state.cpp
|
||||
+++ b/src/mongo/db/initialize_server_global_state.cpp
|
||||
@@ -328,7 +328,7 @@
|
||||
<< "\" should name a file, not a directory.");
|
||||
}
|
||||
|
||||
- if (!serverGlobalParams.logAppend && boost::filesystem::is_regular(absoluteLogpath)) {
|
||||
+ if (!serverGlobalParams.logAppend && boost::filesystem::is_regular_file(absoluteLogpath)) {
|
||||
std::string renameTarget = absoluteLogpath + "." + terseCurrentTimeForFilename();
|
||||
boost::system::error_code ec;
|
||||
boost::filesystem::rename(absoluteLogpath, renameTarget, ec);
|
||||
|
||||
@@ -13,15 +13,6 @@ https://bugs.gentoo.org/932251#c3
|
||||
#include <fmt/format.h>
|
||||
#include <iostream>
|
||||
#include <memory>
|
||||
@@ -328,7 +328,7 @@
|
||||
<< "\" should name a file, not a directory.");
|
||||
}
|
||||
|
||||
- if (!serverGlobalParams.logAppend && boost::filesystem::is_regular(absoluteLogpath)) {
|
||||
+ if (!serverGlobalParams.logAppend && boost::filesystem::is_regular_file(absoluteLogpath)) {
|
||||
std::string renameTarget = absoluteLogpath + "." + terseCurrentTimeForFilename();
|
||||
boost::system::error_code ec;
|
||||
boost::filesystem::rename(absoluteLogpath, renameTarget, ec);
|
||||
--- a/src/mongo/db/startup_warnings_mongod.cpp
|
||||
+++ b/src/mongo/db/startup_warnings_mongod.cpp
|
||||
@@ -34,6 +34,7 @@
|
||||
|
||||
@@ -75,6 +75,7 @@ PATCHES=(
|
||||
"${FILESDIR}/${PN}-5.0.16-arm64-assert.patch"
|
||||
"${FILESDIR}/${PN}-4.4.29-no-enterprise.patch"
|
||||
"${FILESDIR}/${PN}-5.0.26-boost-1.85.patch"
|
||||
"${FILESDIR}/${PN}-5.0.26-boost-1.85-extra.patch"
|
||||
)
|
||||
|
||||
python_check_deps() {
|
||||
|
||||
Reference in New Issue
Block a user