Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Nov 2024 11:52:28 GMT
From:      Dima Panov <fluffy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: ddbaa6195e6b - main - devel/valgrind-devel: improve MPI library handling in plist for supported ARCHes
Message-ID:  <202411201152.4AKBqSZa027899@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by fluffy:

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

commit ddbaa6195e6b027b95cc35d4f7ab067db75944f5
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2024-11-20 11:51:38 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2024-11-20 11:52:14 +0000

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

diff --git a/devel/valgrind-devel/Makefile b/devel/valgrind-devel/Makefile
index 51ee666df0d2..deada311bf15 100644
--- a/devel/valgrind-devel/Makefile
+++ b/devel/valgrind-devel/Makefile
@@ -61,6 +61,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-devel/pkg-plist b/devel/valgrind-devel/pkg-plist
index 29d73b041687..61249da686de 100644
--- a/devel/valgrind-devel/pkg-plist
+++ b/devel/valgrind-devel/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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411201152.4AKBqSZa027899>