commit: e954014d7697b1f14f6346c8eb214e38402b718a Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Fri Feb 13 04:58:50 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Feb 13 05:11:28 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e954014d
dev-db/mongodb: fix boost-1.89 build for 5.x, 6.x and 7.x Bug: https://bugs.gentoo.org/969020 See-Also: 7cd0307c37b055c304f3db1aa3a5f378712f8f35 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/45791 Closes: https://github.com/gentoo/gentoo/pull/45791 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/mongodb-5.0.32-boost-system.patch | 23 ++++++++++++++++++++++ .../files/mongodb-8.0.12-boost-system.patch | 13 ++++++------ dev-db/mongodb/mongodb-5.0.32.ebuild | 1 + dev-db/mongodb/mongodb-6.0.27.ebuild | 1 + dev-db/mongodb/mongodb-7.0.28.ebuild | 1 + 5 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dev-db/mongodb/files/mongodb-5.0.32-boost-system.patch b/dev-db/mongodb/files/mongodb-5.0.32-boost-system.patch new file mode 100644 index 000000000000..6b83d2ad7440 --- /dev/null +++ b/dev-db/mongodb/files/mongodb-5.0.32-boost-system.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/969020 + +--- a/SConstruct ++++ b/SConstruct +@@ -1177,7 +1177,7 @@ def printLocalInfo(): + + printLocalInfo() + +-boostLibs = [ "filesystem", "program_options", "system", "iostreams", "thread", "log" ] ++boostLibs = [ "filesystem", "program_options", "iostreams", "thread", "log" ] + + onlyServer = len( COMMAND_LINE_TARGETS ) == 0 or ( len( COMMAND_LINE_TARGETS ) == 1 and str( COMMAND_LINE_TARGETS[0] ) in [ "mongod" , "mongos" , "test" ] ) + +--- a/src/third_party/SConscript ++++ b/src/third_party/SConscript +@@ -347,7 +347,6 @@ if use_system_version_of_library("boost"): + SYSLIBDEPS=[ + env['LIBDEPS_BOOST_PROGRAM_OPTIONS_SYSLIBDEP'], + env['LIBDEPS_BOOST_FILESYSTEM_SYSLIBDEP'], +- env['LIBDEPS_BOOST_SYSTEM_SYSLIBDEP'], + env['LIBDEPS_BOOST_IOSTREAMS_SYSLIBDEP'], + env['LIBDEPS_BOOST_THREAD_SYSLIBDEP'], + env['LIBDEPS_BOOST_LOG_SYSLIBDEP'], diff --git a/dev-db/mongodb/files/mongodb-8.0.12-boost-system.patch b/dev-db/mongodb/files/mongodb-8.0.12-boost-system.patch index 1d72cbbfd29a..0d9c7c65af65 100644 --- a/dev-db/mongodb/files/mongodb-8.0.12-boost-system.patch +++ b/dev-db/mongodb/files/mongodb-8.0.12-boost-system.patch @@ -1,6 +1,8 @@ -diff '--color=auto' -dupr mongo-r8.0.12.orig/SConstruct mongo-r8.0.12/SConstruct ---- mongo-r8.0.12.orig/SConstruct 2025-12-24 07:40:37.384561186 +0100 -+++ mongo-r8.0.12/SConstruct 2025-12-24 07:40:53.107849946 +0100 +https://bugs.gentoo.org/963976 +https://bugs.gentoo.org/969020 + +--- mongo-r8.0.12.orig/SConstruct ++++ mongo-r8.0.12/SConstruct @@ -1683,7 +1683,7 @@ def printLocalInfo(): printLocalInfo() @@ -10,9 +12,8 @@ diff '--color=auto' -dupr mongo-r8.0.12.orig/SConstruct mongo-r8.0.12/SConstruct onlyServer = len(COMMAND_LINE_TARGETS) == 0 or (len(COMMAND_LINE_TARGETS) == 1 and str( COMMAND_LINE_TARGETS[0]) in ["mongod", "mongos", "test"]) -diff '--color=auto' -dupr mongo-r8.0.12.orig/src/third_party/SConscript mongo-r8.0.12/src/third_party/SConscript ---- mongo-r8.0.12.orig/src/third_party/SConscript 2025-12-24 07:40:37.718019419 +0100 -+++ mongo-r8.0.12/src/third_party/SConscript 2025-12-24 07:41:15.134959202 +0100 +--- mongo-r8.0.12.orig/src/third_party/SConscript ++++ mongo-r8.0.12/src/third_party/SConscript @@ -436,7 +436,6 @@ if use_system_version_of_library("boost" boostEnv = boostEnv.Clone(SYSLIBDEPS=[ env['LIBDEPS_BOOST_PROGRAM_OPTIONS_SYSLIBDEP'], diff --git a/dev-db/mongodb/mongodb-5.0.32.ebuild b/dev-db/mongodb/mongodb-5.0.32.ebuild index 3ebd181386d1..9848519ecae2 100644 --- a/dev-db/mongodb/mongodb-5.0.32.ebuild +++ b/dev-db/mongodb/mongodb-5.0.32.ebuild @@ -82,6 +82,7 @@ PATCHES=( "${WORKDIR}/mongodb-5.0.30-patches/${PN}-5.0.30-gcc-15.patch" "${WORKDIR}/mongodb-5.0.30-patches/${PN}-5.0.26-scons.patch" "${WORKDIR}/mongodb-5.0.30-patches/${PN}-5.0.26-mozjs-remove-unused-constructor.patch" + "${FILESDIR}/mongodb-5.0.32-boost-system.patch" ) python_check_deps() { diff --git a/dev-db/mongodb/mongodb-6.0.27.ebuild b/dev-db/mongodb/mongodb-6.0.27.ebuild index ec786095f7a7..c885dccb73be 100644 --- a/dev-db/mongodb/mongodb-6.0.27.ebuild +++ b/dev-db/mongodb/mongodb-6.0.27.ebuild @@ -74,6 +74,7 @@ PATCHES=( "${WORKDIR}/mongodb-6.0.22-patches/mongodb-6.0.7-gcc-13.patch" "${WORKDIR}/mongodb-6.0.22-patches/mongodb-6.0.21-boost-1.85.patch" "${WORKDIR}/mongodb-6.0.22-patches/mongodb-6.0.2-sconstruct-changes.patch" + "${FILESDIR}/mongodb-5.0.32-boost-system.patch" ) python_check_deps() { diff --git a/dev-db/mongodb/mongodb-7.0.28.ebuild b/dev-db/mongodb/mongodb-7.0.28.ebuild index cdd75e5e8604..fa1d52b485fa 100644 --- a/dev-db/mongodb/mongodb-7.0.28.ebuild +++ b/dev-db/mongodb/mongodb-7.0.28.ebuild @@ -74,6 +74,7 @@ PATCHES=( "${WORKDIR}/mongodb-7.0.18-patches/extrapatch-sconstruct.patch" "${WORKDIR}/mongodb-7.0.18-patches/mongodb-7.0.18-boost-1.85.patch" "${FILESDIR}/mongodb-7.0.28-sconstruct.patch" + "${FILESDIR}/mongodb-8.0.12-boost-system.patch" ) python_check_deps() {
