git: 3ab18c284b0e - main - databases/mongodb[67]0: forgot to commit a patch
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 24 Dec 2024 09:27:09 UTC
The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=3ab18c284b0e29c69256346246de022eba6d4161 commit 3ab18c284b0e29c69256346246de022eba6d4161 Author: Ronald Klop <ronald@FreeBSD.org> AuthorDate: 2024-12-24 09:24:53 +0000 Commit: Ronald Klop <ronald@FreeBSD.org> CommitDate: 2024-12-24 09:24:53 +0000 databases/mongodb[67]0: forgot to commit a patch Fixes: 38836ff12d "databases/mongodb60: fix build with llvm19" Fixes: 895b2a5c0485 "databases/mongodb70: fix build with llvm19" --- ...atch-src_third__party_boost_boost_thread_future.hpp | 18 ++++++++++++++++++ ...atch-src_third__party_boost_boost_thread_future.hpp | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/databases/mongodb60/files/patch-src_third__party_boost_boost_thread_future.hpp b/databases/mongodb60/files/patch-src_third__party_boost_boost_thread_future.hpp new file mode 100644 index 000000000000..cf4ad80ef93d --- /dev/null +++ b/databases/mongodb60/files/patch-src_third__party_boost_boost_thread_future.hpp @@ -0,0 +1,18 @@ +https://github.com/boostorg/thread/issues/402 + +In file included from src/third_party/boost/libs/thread/src/pthread/thread.cpp:19: +src/third_party/boost/boost/thread/future.hpp:4672:19: error: no member named 'that' in 'run_it<FutureExecutorContinuationSharedState>'; did you mean 'that_'? + 4672 | that_=x.that; + | ^~~~ + +--- src/third_party/boost/boost/thread/future.hpp.orig 2024-12-12 08:36:29 UTC ++++ src/third_party/boost/boost/thread/future.hpp +@@ -4669,7 +4669,7 @@ namespace detail + } + run_it& operator=(BOOST_THREAD_RV_REF(run_it) x) BOOST_NOEXCEPT { + if (this != &x) { +- that_=x.that; ++ that_=x.that_; + x.that_.reset(); + } + return *this; diff --git a/databases/mongodb70/files/patch-src_third__party_boost_boost_thread_future.hpp b/databases/mongodb70/files/patch-src_third__party_boost_boost_thread_future.hpp new file mode 100644 index 000000000000..cf4ad80ef93d --- /dev/null +++ b/databases/mongodb70/files/patch-src_third__party_boost_boost_thread_future.hpp @@ -0,0 +1,18 @@ +https://github.com/boostorg/thread/issues/402 + +In file included from src/third_party/boost/libs/thread/src/pthread/thread.cpp:19: +src/third_party/boost/boost/thread/future.hpp:4672:19: error: no member named 'that' in 'run_it<FutureExecutorContinuationSharedState>'; did you mean 'that_'? + 4672 | that_=x.that; + | ^~~~ + +--- src/third_party/boost/boost/thread/future.hpp.orig 2024-12-12 08:36:29 UTC ++++ src/third_party/boost/boost/thread/future.hpp +@@ -4669,7 +4669,7 @@ namespace detail + } + run_it& operator=(BOOST_THREAD_RV_REF(run_it) x) BOOST_NOEXCEPT { + if (this != &x) { +- that_=x.that; ++ that_=x.that_; + x.that_.reset(); + } + return *this;