Dessa/gentoo
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

[dev-db/mongodb] split boost 1.85 so it can be reused, 6 should build now

Browse Source
This commit is contained in:
Robert Förster 2024-06-01 18:37:41 +02:00
parent 515cc1e59d
commit 6b974d959a
5 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dev-db/mongodb/files/mongodb-5.0.26-boost-1.85-extra.patch Normal file
View 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);

9
dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch
View File

@ -13,15 +13,6 @@ https://bugs.gentoo.org/932251#c3
#include <fmt/format.h> #include <fmt/format.h>
#include <iostream> #include <iostream>
#include <memory> #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 --- a/src/mongo/db/startup_warnings_mongod.cpp
+++ b/src/mongo/db/startup_warnings_mongod.cpp +++ b/src/mongo/db/startup_warnings_mongod.cpp
@@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@

15
dev-db/mongodb/files/mongodb-6.0.15-boost-1.85.patch Normal file
View File

@ -0,0 +1,15 @@
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
@@ -307,7 +307,7 @@ bool checkAndMoveLogFile(const std::string& absoluteLogpath) {
<< "\" 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);

2
dev-db/mongodb/mongodb-5.0.26.ebuild
View File

@ -72,8 +72,10 @@ PATCHES=(
"${FILESDIR}/${PN}-5.0.5-no-force-lld.patch" "${FILESDIR}/${PN}-5.0.5-no-force-lld.patch"
"${FILESDIR}/${PN}-4.4.10-boost-1.81.patch" "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
"${FILESDIR}/${PN}-5.0.5-boost-1.81-extra.patch" "${FILESDIR}/${PN}-5.0.5-boost-1.81-extra.patch"
"${FILESDIR}/${PN}-5.0.16-arm64-assert.patch"
"${FILESDIR}/${PN}-4.4.29-no-enterprise.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.patch"
"${FILESDIR}/${PN}-5.0.26-boost-1.85-extra.patch"
) )
python_check_deps() { python_check_deps() {

10
dev-db/mongodb/mongodb-6.0.15.ebuild
View File

@ -68,14 +68,16 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.1-gcc11.patch" "${FILESDIR}/${PN}-4.4.1-gcc11.patch"
"${FILESDIR}/${PN}-5.0.2-no-compass.patch" "${FILESDIR}/${PN}-5.0.2-no-compass.patch"
"${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch" "${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch"
"${FILESDIR}/${P}-boost-1.79.patch" "${FILESDIR}/${PN}-6.0.15-boost-1.79.patch"
"${FILESDIR}/${P}-sconstruct-changes.patch" "${FILESDIR}/${PN}-6.0.15-sconstruct-changes.patch"
"${FILESDIR}/${P}-gcc-12.patch" "${FILESDIR}/${PN}-6.0.15-gcc-12.patch"
"${FILESDIR}/${P}-gcc-13.patch" "${FILESDIR}/${PN}-6.0.15-gcc-13.patch"
"${FILESDIR}/${PN}-4.4.10-boost-1.81.patch" "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
"${FILESDIR}/${PN}-5.0.5-boost-1.81-extra.patch" "${FILESDIR}/${PN}-5.0.5-boost-1.81-extra.patch"
"${FILESDIR}/${PN}-5.0.16-arm64-assert.patch"
"${FILESDIR}/${PN}-4.4.29-no-enterprise.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.patch"
"${FILESDIR}/${PN}-6.0.15-boost-1.85.patch"
) )
python_check_deps() { python_check_deps() {