From 6b974d959a113d00eaeb54d017475fd69c3557f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Sat, 1 Jun 2024 18:37:41 +0200 Subject: [PATCH] [dev-db/mongodb] split boost 1.85 so it can be reused, 6 should build now --- .../files/mongodb-5.0.26-boost-1.85-extra.patch | 16 ++++++++++++++++ .../files/mongodb-5.0.26-boost-1.85.patch | 9 --------- .../files/mongodb-6.0.15-boost-1.85.patch | 15 +++++++++++++++ dev-db/mongodb/mongodb-5.0.26.ebuild | 2 ++ dev-db/mongodb/mongodb-6.0.15.ebuild | 10 ++++++---- 5 files changed, 39 insertions(+), 13 deletions(-) create mode 100644 dev-db/mongodb/files/mongodb-5.0.26-boost-1.85-extra.patch create mode 100644 dev-db/mongodb/files/mongodb-6.0.15-boost-1.85.patch diff --git a/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85-extra.patch b/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85-extra.patch new file mode 100644 index 0000000..b3e3aab --- /dev/null +++ b/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85-extra.patch @@ -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); + diff --git a/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch b/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch index 71da50f..23bd6f7 100644 --- a/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch +++ b/dev-db/mongodb/files/mongodb-5.0.26-boost-1.85.patch @@ -13,15 +13,6 @@ https://bugs.gentoo.org/932251#c3 #include #include #include -@@ -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 @@ diff --git a/dev-db/mongodb/files/mongodb-6.0.15-boost-1.85.patch b/dev-db/mongodb/files/mongodb-6.0.15-boost-1.85.patch new file mode 100644 index 0000000..c5b0f76 --- /dev/null +++ b/dev-db/mongodb/files/mongodb-6.0.15-boost-1.85.patch @@ -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); diff --git a/dev-db/mongodb/mongodb-5.0.26.ebuild b/dev-db/mongodb/mongodb-5.0.26.ebuild index 9178e5c..99a18e2 100644 --- a/dev-db/mongodb/mongodb-5.0.26.ebuild +++ b/dev-db/mongodb/mongodb-5.0.26.ebuild @@ -72,8 +72,10 @@ PATCHES=( "${FILESDIR}/${PN}-5.0.5-no-force-lld.patch" "${FILESDIR}/${PN}-4.4.10-boost-1.81.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}-5.0.26-boost-1.85.patch" + "${FILESDIR}/${PN}-5.0.26-boost-1.85-extra.patch" ) python_check_deps() { diff --git a/dev-db/mongodb/mongodb-6.0.15.ebuild b/dev-db/mongodb/mongodb-6.0.15.ebuild index 39f70f8..4252fd0 100644 --- a/dev-db/mongodb/mongodb-6.0.15.ebuild +++ b/dev-db/mongodb/mongodb-6.0.15.ebuild @@ -68,14 +68,16 @@ PATCHES=( "${FILESDIR}/${PN}-4.4.1-gcc11.patch" "${FILESDIR}/${PN}-5.0.2-no-compass.patch" "${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch" - "${FILESDIR}/${P}-boost-1.79.patch" - "${FILESDIR}/${P}-sconstruct-changes.patch" - "${FILESDIR}/${P}-gcc-12.patch" - "${FILESDIR}/${P}-gcc-13.patch" + "${FILESDIR}/${PN}-6.0.15-boost-1.79.patch" + "${FILESDIR}/${PN}-6.0.15-sconstruct-changes.patch" + "${FILESDIR}/${PN}-6.0.15-gcc-12.patch" + "${FILESDIR}/${PN}-6.0.15-gcc-13.patch" "${FILESDIR}/${PN}-4.4.10-boost-1.81.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}-5.0.26-boost-1.85.patch" + "${FILESDIR}/${PN}-6.0.15-boost-1.85.patch" ) python_check_deps() {