git: 26eb44612553 - main - devel/valgrind: improve MPI library handling in plist for supported ARCHes

From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Wed, 20 Nov 2024 11:52:26 UTC
The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=26eb446125536bd43b2a3d8d6e63b9925945e90b

commit 26eb446125536bd43b2a3d8d6e63b9925945e90b
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2024-11-20 11:49:56 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2024-11-20 11:52:13 +0000

    devel/valgrind: improve MPI library handling in plist for supported ARCHes
    
    Approved by:    portmgr blanket (trivial packaging fix)
    
    Sponsored by:   Future Crew, LLC
---
 devel/valgrind/Makefile  | 2 ++
 devel/valgrind/pkg-plist | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile
index 29eb5f0831ba..e90493538004 100644
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile
@@ -57,6 +57,8 @@ MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 
 .include <bsd.port.options.mk>
 
+PLIST_SUB+=	ARCH=${ARCH:S/i386/x86/:S/aarch64/arm64/}
+
 .if ${ARCH} == "amd64"
 PLIST_SUB+=		AMD64=""
 . if !${PORT_OPTIONS:M32BIT}
diff --git a/devel/valgrind/pkg-plist b/devel/valgrind/pkg-plist
index 29d73b041687..61249da686de 100644
--- a/devel/valgrind/pkg-plist
+++ b/devel/valgrind/pkg-plist
@@ -144,7 +144,7 @@ include/valgrind/vki/vki-xen.h
 %%AMD64%%lib/valgrind/libgcc-sup-amd64-freebsd.a
 %%X86%%lib/valgrind/libgcc-sup-x86-freebsd.a
 %%AARCH64%%lib/valgrind/libgcc-sup-arm64-freebsd.a
-%%MPI%%lib/valgrind/libmpiwrap-amd64-freebsd.so
+%%MPI%%lib/valgrind/libmpiwrap-%%ARCH%%-freebsd.so
 %%AMD64%%lib/valgrind/libreplacemalloc_toolpreload-amd64-freebsd.a
 %%X86%%lib/valgrind/libreplacemalloc_toolpreload-x86-freebsd.a
 %%AARCH64%%lib/valgrind/libreplacemalloc_toolpreload-arm64-freebsd.a