repo/gentoo:master commit in: sys-cluster/charm/
"Alfredo Tupone" <[email protected]>
| Newsgroups | gmane.linux.gentoo.cvs |
|---|---|
| Message-ID | <1787077817.c27f4e72b6048cf64fff0c725def58e9f47fa77f.tupone@gentoo> |
commit: c27f4e72b6048cf64fff0c725def58e9f47fa77f
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 18:29:34 2026 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 18:30:17 2026 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c27f4e72
sys-cluster/charm: dont call g++ directly
Closes: https://bugs.gentoo.org/725440
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sys-cluster/charm/charm-6.8.2.ebuild | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys-cluster/charm/charm-6.8.2.ebuild b/sys-cluster/charm/charm-6.8.2.ebuild
index e9311f407aea..c6eee4904ad9 100644
--- a/sys-cluster/charm/charm-6.8.2.ebuild
+++ b/sys-cluster/charm/charm-6.8.2.ebuild
@@ -80,7 +80,11 @@ src_prepare() {
-e '/CMK_F90_MODINC/s:-p:-I:g' \
-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
-i src/arch/$(usex mpi "mpi" "net")*-linux*/*sh || die
+
sed \
+ -e "/CMK_CC='gcc'/s|gcc|$(usex mpi "mpicc" "$(tc-getCC)")|" \
+ -e "/CMK_CXX='g++'/s|g++|$(usex mpi "mpic++" "$(tc-getCXX)")|" \
+ -e "/CMK_LDXX='g++'/s|g++|$(usex mpi "mpic++" "$(tc-getCXX)")|" \
-e "s|CMK_CF90=\$(which .*)|CMK_CF90=\$(which $(usex mpi "mpif90" "$(tc-getFC)"))|" \
-e "/-z \$CMK_CF90/d" \
-e "/F90DIR/s:gfortran:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \