Adding metadata

2 files changed, 54 insertions, 4 deletions

diff --git a/sys-cluster/charm/charm-6.8.2.ebuild b/sys-cluster/charm/charm-6.8.2.ebuild
index c6eee4904ad9..3f8d8cc1cce0 100644
--- a/sys-cluster/charm/charm-6.8.2.ebuild
+++ b/sys-cluster/charm/charm-6.8.2.ebuild
@@ -75,8 +75,8 @@ src_prepare() {
 		-e "/CMK_CF77/s:[fg]77:$(usex mpi "mpif90" "$(tc-getF77)") ${FCFLAGS}:g" \
 		-e "/CMK_CF90/s:f95:$(usex mpi "mpif90" "$(tc-getFC)") ${FCFLAGS}:g" \
 		-e "/CMK_CF90/s:\`which f90.*$::g" \
-		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)") ${CPPFLAGS} ${CXXFLAGS}:g" \
-		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)") ${CPPFLAGS} ${CFLAGS}:g" \
+		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)") ${CPPFLAGS}:g" \
+		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)") ${CPPFLAGS}:g" \
 		-e '/CMK_F90_MODINC/s:-p:-I:g' \
 		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
 		-i src/arch/$(usex mpi "mpi" "net")*-linux*/*sh || die
@@ -100,11 +100,17 @@ src_prepare() {
 		-e "s:-o charmrun:${LDFLAGS} &:g" \
 		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
 		-e "s:-o charmd:${LDFLAGS} &:g" \
-		-e "/^CHARMC/s:$: ${CPPFLAGS} ${CFLAGS}:g" \
+		-e "/^CHARMC/s:$: ${CPPFLAGS}:g" \
 		-i \
 		src/scripts/Makefile \
 		src/util/charmrun-src/Makefile || die
 
+	sed -i \
+		-e "s|^OPTS=\"\"|OPTS=\"-c++-option ${CXXFLAGS} -cc-option ${CFLAGS}\"|" \
+		build || die
+
+	eapply "${FILESDIR}"/${P}-cxxflags.patch
+
 	# CMK optimization
 	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
 
@@ -122,7 +128,9 @@ src_compile() {
 
 	# Build charmm++ first.
 	einfo "running ./build charm++ ${build_commandline}"
-	./build charm++ ${build_commandline} || die "Failed to build charm++"
+	GENTOO_CFLAGS="${CFLAGS}" \
+		GENTOO_CXXFLAGS="${CXXFLAGS}" \
+		./build charm++ ${build_commandline} || die "Failed to build charm++"
 
 	if use ampi; then
 		einfo "running ./build AMPI ${build_commandline}"
@@ -176,6 +184,7 @@ src_install() {
 		[[ -s $i ]] || continue
 		[[ ${i} = *.so ]] && dolib.so "${i}" || dolib.a "${i}"
 	done
+	rm -f "${ED}"/usr/$(get_libdir)/libthreads-fibers.so* || die
 
 	# Install examples.
 	if use examples; then
diff --git a/sys-cluster/charm/files/charm-6.8.2-cxxflags.patch b/sys-cluster/charm/files/charm-6.8.2-cxxflags.patch
new file mode 100644
index 000000000000..90f533d16d0b
--- /dev/null
+++ b/sys-cluster/charm/files/charm-6.8.2-cxxflags.patch
@@ -0,0 +1,41 @@
+--- a/src/scripts/Makefile	2026-08-19 15:35:52.989866868 +0200
++++ b/src/scripts/Makefile	2026-08-19 15:37:06.201087059 +0200
+@@ -548,7 +548,7 @@
+ $(L)/libmemory-os-wrapper.a: memory-os-wrapper.C $(MEM_DEPS)
+ 	-$(CHARMC) -o $@ memory-os-wrapper.C || touch $@
+ 
+-$(eval $(call libmem,hooks-charmdebug,,-DCMK_MEMORY_BUILD_GNU_HOOKS -DCMK_MEMORY_BUILD_CHARMDEBUG -touch-on-failure))
++$(eval $(call libmem,hooks-charmdebug,,-DCMK_MEMORY_BUILD_CHARMDEBUG -touch-on-failure))
+ 
+ # If the system doesn't have sbrk, these compilations may fail.
+ #  This is OK, but then we can't use "-memory gnu" or friends.
+@@ -797,7 +797,7 @@
+ 	$(NATIVECHARMC) -language c -o conv-cpm -cp ../bin/ conv-cpm.o
+ 
+ conv-cpm.o: conv-cpm.c $(CVHEADERS)
+-	$(NATIVECHARMC) conv-cpm.c
++	$(NATIVECHARMC) conv-cpm.c $(GENTOO_CFLAGS)
+ 
+ ###############################################################################
+ #
+@@ -812,7 +812,8 @@
+ 
+ $(CHARMXIOBJ) $(SDAGOBJ): $(XIHEADERS) $(SDAGHEADERS)
+ $(CHARMXIOBJ) $(SDAGOBJ): CXX=$(NATIVECHARMC)
+-$(CHARMXIOBJ) $(SDAGOBJ): CXXFLAGS=-I$(SRCBASE)/xlat-i/ -I$(SRCBASE)/xlat-i/sdag/ -I.
++$(CHARMXIOBJ) $(SDAGOBJ): CPPFLAGS=-I$(SRCBASE)/xlat-i/ -I$(SRCBASE)/xlat-i/sdag/ -I.
++$(CHARMXIOBJ) $(SDAGOBJ): CXXFLAGS=$(GENTOO_CXXFLAGS)
+ xi-scan.o: CXXFLAGS+=-DYY_NEVER_INTERACTIVE
+ VPATH=$(SRCBASE)/xlat-i:$(SRCBASE)/xlat-i/sdag:$(SRCBASE)/xlat-i/sdag/constructs
+ 
+--- a/src/scripts/charmc	2026-08-19 16:26:00.201831808 +0200
++++ b/src/scripts/charmc	2026-08-19 16:26:46.196342106 +0200
+@@ -1412,7 +1412,7 @@
+                 echo "OPTS_CXX = $OPTS_CXX"
+                 if [ -n "$NATIVE" ]
+                 then
+-                    Do $CMK_NATIVE_CXX -I$CHARMINC $CMK_SYSINC $OPTS_CPP_INTERNAL $OPTS_CPP -c $FILE $DESTO
++                    Do $CMK_NATIVE_CXX -I$CHARMINC $CMK_SYSINC $OPTS_CPP_INTERNAL $OPTS_CPP $OPTS_CXX -c $FILE $DESTO
+                 else
+                     Do $CMK_CXX -I$CHARMINC $CMK_SYSINC $OPTS_CPP_INTERNAL $OPTS_CPP $OPTS_CXX -c $FILE $DESTO
+                 fi