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

[dev-db/mongodb] more clang. sigh.

Browse Source
This commit is contained in:
Robert Förster 2024-12-08 21:42:21 +01:00
parent dada1fc5ce
commit aeb6fbe34e
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,11 +44,6 @@ RDEPEND="acct-group/mongodb
dev-libs/snowball-stemmer:= dev-libs/snowball-stemmer:=
net-misc/curl net-misc/curl
>=sys-libs/zlib-1.2.12:= >=sys-libs/zlib-1.2.12:=
clang? (
$(llvm_gen_dep "
sys-devel/clang:\${LLVM_SLOT}
")
)
kerberos? ( dev-libs/cyrus-sasl[kerberos] ) kerberos? ( dev-libs/cyrus-sasl[kerberos] )
ssl? ( ssl? (
>=dev-libs/openssl-1.0.1g:0= >=dev-libs/openssl-1.0.1g:0=
@ -59,6 +54,12 @@ DEPEND="${RDEPEND}
sys-libs/readline:0= sys-libs/readline:0=
debug? ( dev-debug/valgrind )" debug? ( dev-debug/valgrind )"
BDEPEND=" BDEPEND="
clang? (
$(llvm_gen_dep "
sys-devel/clang:\${LLVM_SLOT}
sys-devel/llvm:\${LLVM_SLOT}
")
)
$(python_gen_any_dep ' $(python_gen_any_dep '
>=dev-build/scons-3.1.1[${PYTHON_USEDEP}] >=dev-build/scons-3.1.1[${PYTHON_USEDEP}]
dev-python/cheetah3[${PYTHON_USEDEP}] dev-python/cheetah3[${PYTHON_USEDEP}]
@ -120,7 +121,6 @@ pkg_setup() {
python-any-r1_pkg_setup python-any-r1_pkg_setup
if use clang; then if use clang; then
llvm-r1_pkg_setup llvm-r1_pkg_setup
llvm_fix_tool_path CC CXX
fi fi
} }
@ -156,7 +156,7 @@ src_configure() {
) )
local have_switched_compiler= local have_switched_compiler=
if use clang && ! tc-is-clang; then if use clang && ! tc-is-clang || tc-is-clang; then
# Force clang # Force clang
local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }') local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }')
[[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}") [[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}")

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

@ -44,11 +44,6 @@ RDEPEND="acct-group/mongodb
dev-libs/snowball-stemmer:= dev-libs/snowball-stemmer:=
net-misc/curl net-misc/curl
>=sys-libs/zlib-1.2.12:= >=sys-libs/zlib-1.2.12:=
clang? (
$(llvm_gen_dep "
sys-devel/clang:\${LLVM_SLOT}
")
)
kerberos? ( dev-libs/cyrus-sasl[kerberos] ) kerberos? ( dev-libs/cyrus-sasl[kerberos] )
ssl? ( ssl? (
>=dev-libs/openssl-1.0.1g:0= >=dev-libs/openssl-1.0.1g:0=
@ -59,6 +54,12 @@ DEPEND="${RDEPEND}
sys-libs/readline:0= sys-libs/readline:0=
debug? ( dev-debug/valgrind )" debug? ( dev-debug/valgrind )"
BDEPEND=" BDEPEND="
clang? (
$(llvm_gen_dep "
sys-devel/clang:\${LLVM_SLOT}
sys-devel/llvm:\${LLVM_SLOT}
")
)
$(python_gen_any_dep ' $(python_gen_any_dep '
>=dev-build/scons-3.1.1[${PYTHON_USEDEP}] >=dev-build/scons-3.1.1[${PYTHON_USEDEP}]
dev-python/cheetah3[${PYTHON_USEDEP}] dev-python/cheetah3[${PYTHON_USEDEP}]
@ -113,7 +114,6 @@ pkg_setup() {
python-any-r1_pkg_setup python-any-r1_pkg_setup
if use clang; then if use clang; then
llvm-r1_pkg_setup llvm-r1_pkg_setup
llvm_fix_tool_path CC CXX
fi fi
} }
@ -149,7 +149,7 @@ src_configure() {
) )
local have_switched_compiler= local have_switched_compiler=
if use clang && ! tc-is-clang; then if use clang && ! tc-is-clang || tc-is-clang; then
# Force clang # Force clang
local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }') local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }')
[[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}") [[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}")