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

[dev-db/mongodb] driver dep dropped, added clang patch

Browse Source
This commit is contained in:
Robert Förster 2024-07-25 12:10:58 +02:00
parent 897da73489
commit 3ec35b706e
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dev-db/mongodb/files/mongodb-5.0.28-clang.patch Normal file
View File

@ -0,0 +1,14 @@
https://bugs.gentoo.org/829340
diff --git a/SConstruct b/SConstruct
index 7062a072de7..df14a73723c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1253,7 +1253,7 @@ envDict = dict(BUILD_ROOT=buildDir,
if get_option('build-tools') == 'next':
SCons.Tool.DefaultToolpath.insert(0, os.path.abspath('site_scons/site_tools/next'))
-env = Environment(variables=env_vars, **envDict)
+env = Environment(variables=env_vars, ENV = {'PATH' : os.environ['PATH']}, **envDict)
del envDict
if get_option('cache-signature-mode') == 'validate':

6
dev-db/mongodb/mongodb-5.0.28.ebuild
View File

@ -3,7 +3,7 @@
EAPI=8 EAPI=8
PYTHON_COMPAT=( python3_{10..12} ) PYTHON_COMPAT=( python3_{10..13} )
SCONS_MIN_VERSION="3.3.1" SCONS_MIN_VERSION="3.3.1"
CHECKREQS_DISK_BUILD="2400M" CHECKREQS_DISK_BUILD="2400M"
@ -56,7 +56,6 @@ BDEPEND="
dev-python/psutil[${PYTHON_USEDEP}] dev-python/psutil[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}]
') ')
>=dev-libs/mongo-c-driver-1.13.0
" "
PDEPEND=" PDEPEND="
mongosh? ( app-admin/mongosh-bin ) mongosh? ( app-admin/mongosh-bin )
@ -78,6 +77,7 @@ PATCHES=(
"${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" "${FILESDIR}/${PN}-5.0.26-boost-1.85-extra.patch"
"${FILESDIR}/${PN}-5.0.28-clang.patch"
) )
python_check_deps() { python_check_deps() {
@ -127,7 +127,6 @@ src_configure() {
CC="$(tc-getCC)" CC="$(tc-getCC)"
CXX="$(tc-getCXX)" CXX="$(tc-getCXX)"
CCFLAGS="${CXXFLAGS}" CCFLAGS="${CXXFLAGS}"
CPPPATH="${EPREFIX}/usr/include/libmongoc-1.0"
VERBOSE=1 VERBOSE=1
VARIANT_DIR=gentoo VARIANT_DIR=gentoo
@ -138,7 +137,6 @@ src_configure() {
--force-jobs # Reapply #906897, fix #935274 --force-jobs # Reapply #906897, fix #935274
--jobs="$(makeopts_jobs)" --jobs="$(makeopts_jobs)"
--use-system-boost --use-system-boost
--use-system-mongo-c
--use-system-pcre --use-system-pcre
--use-system-snappy --use-system-snappy
--use-system-stemmer --use-system-stemmer

5
dev-db/mongodb/mongodb-6.0.16.ebuild
View File

@ -3,7 +3,7 @@
EAPI=8 EAPI=8
PYTHON_COMPAT=( python3_{10..12} ) PYTHON_COMPAT=( python3_{10..13} )
SCONS_MIN_VERSION="3.3.1" SCONS_MIN_VERSION="3.3.1"
CHECKREQS_DISK_BUILD="2400M" CHECKREQS_DISK_BUILD="2400M"
@ -59,7 +59,6 @@ BDEPEND="
dev-python/regex[${PYTHON_USEDEP}] dev-python/regex[${PYTHON_USEDEP}]
dev-python/typing-extensions[${PYTHON_USEDEP}] dev-python/typing-extensions[${PYTHON_USEDEP}]
') ')
>=dev-libs/mongo-c-driver-1.13.0
" "
PDEPEND=" PDEPEND="
mongosh? ( app-admin/mongosh-bin ) mongosh? ( app-admin/mongosh-bin )
@ -80,6 +79,7 @@ PATCHES=(
"${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.16-boost-1.85.patch" "${FILESDIR}/${PN}-6.0.16-boost-1.85.patch"
"${FILESDIR}/${PN}-5.0.28-clang.patch"
) )
python_check_deps() { python_check_deps() {
@ -132,7 +132,6 @@ src_configure() {
CC="$(tc-getCC)" CC="$(tc-getCC)"
CXX="$(tc-getCXX)" CXX="$(tc-getCXX)"
CCFLAGS="${CXXFLAGS}" CCFLAGS="${CXXFLAGS}"
CPPPATH="${EPREFIX}/usr/include/libmongoc-1.0"
VERBOSE=1 VERBOSE=1
VARIANT_DIR=gentoo VARIANT_DIR=gentoo