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

[dev-db/mongodb] fix patch for 6 and up

Browse Source
This commit is contained in:
Robert Förster 2024-12-17 16:19:51 +01:00
parent 1a7a3a7ecf
commit abbda3f701
3 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dev-db/mongodb/files/mongodb-6.0.19-mozjs-remove-unused-constructor.patch Normal file
View File

@ -0,0 +1,23 @@
https://phabricator.services.mozilla.com/D209108
https://github.com/mozilla/gecko-dev/commit/33cdc6655b0de44cb7a431216dcbb0d5a552aec6
clang 19 will report error if w/o this patch:
src/third_party/mozjs/extract/js/src/threading/ExclusiveData.h:113:29: error: reference to non-static member function must be called
diff --git a/src/third_party/mozjs/extract/js/src/threading/ExclusiveData.h b/src/third_party/mozjs/extract/js/src/threading/ExclusiveData.h
index c43cd1797ca..c401797fafd 100644
--- a/src/third_party/mozjs/extract/js/src/threading/ExclusiveData.h
+++ b/src/third_party/mozjs/extract/js/src/threading/ExclusiveData.h
@@ -109,11 +109,6 @@ class ExclusiveData {
explicit ExclusiveData(const MutexId& id, Args&&... args)
: lock_(id), value_(std::forward<Args>(args)...) {}
- ExclusiveData(ExclusiveData&& rhs)
- : lock_(std::move(rhs.lock)), value_(std::move(rhs.value_)) {
- MOZ_ASSERT(&rhs != this, "self-move disallowed!");
- }
-
ExclusiveData& operator=(ExclusiveData&& rhs) {
this->~ExclusiveData();
new (mozilla::KnownNotNull, this) ExclusiveData(std::move(rhs));

7
dev-db/mongodb/mongodb-6.0.19.ebuild
View File

@ -76,7 +76,7 @@ PATCHES=(
"${FILESDIR}/${PN}-6.0.18-boost-1.85.patch" "${FILESDIR}/${PN}-6.0.18-boost-1.85.patch"
"${FILESDIR}/${PN}-5.0.30-gcc-15.patch" "${FILESDIR}/${PN}-5.0.30-gcc-15.patch"
"${FILESDIR}/${PN}-5.0.26-scons.patch" "${FILESDIR}/${PN}-5.0.26-scons.patch"
"${FILESDIR}/${PN}-5.0.26-mozjs-remove-unused-constructor.patch" "${FILESDIR}/${PN}-6.0.19-mozjs-remove-unused-constructor.patch"
) )
python_check_deps() { python_check_deps() {
@ -123,6 +123,11 @@ src_configure() {
# --use-system-tcmalloc is strongly NOT recommended: # --use-system-tcmalloc is strongly NOT recommended:
# for MONGO_GIT_HASH use GitOrigin-RevId from the commit of the tag # for MONGO_GIT_HASH use GitOrigin-RevId from the commit of the tag
scons_opts=( scons_opts=(
AR="$(tc-getAR)"
CC="$(tc-getCC)"
CXX="$(tc-getCXX)"
CCFLAGS="${CXXFLAGS}"
VERBOSE=1 VERBOSE=1
VARIANT_DIR=gentoo VARIANT_DIR=gentoo
MONGO_VERSION="${PV}" MONGO_VERSION="${PV}"

7
dev-db/mongodb/mongodb-7.0.15.ebuild
View File

@ -69,7 +69,7 @@ PATCHES=(
"${FILESDIR}/${PN}-7.0.15-system-boost.patch" "${FILESDIR}/${PN}-7.0.15-system-boost.patch"
"${FILESDIR}/${PN}-7.0.15-gcc-15.patch" "${FILESDIR}/${PN}-7.0.15-gcc-15.patch"
"${FILESDIR}/${PN}-5.0.26-scons.patch" "${FILESDIR}/${PN}-5.0.26-scons.patch"
"${FILESDIR}/${PN}-5.0.26-mozjs-remove-unused-constructor.patch" "${FILESDIR}/${PN}-6.0.19-mozjs-remove-unused-constructor.patch"
) )
python_check_deps() { python_check_deps() {
@ -116,6 +116,11 @@ src_configure() {
# --use-system-tcmalloc is strongly NOT recommended: # --use-system-tcmalloc is strongly NOT recommended:
# for MONGO_GIT_HASH use GitOrigin-RevId from the commit of the tag # for MONGO_GIT_HASH use GitOrigin-RevId from the commit of the tag
scons_opts=( scons_opts=(
AR="$(tc-getAR)"
CC="$(tc-getCC)"
CXX="$(tc-getCXX)"
CCFLAGS="${CXXFLAGS}"
VERBOSE=1 VERBOSE=1
VARIANT_DIR=gentoo VARIANT_DIR=gentoo
MONGO_VERSION="${PV}" MONGO_VERSION="${PV}"