From nobody Wed Nov 20 11:52:28 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xtfqc2w7dz5dfMW; Wed, 20 Nov 2024 11:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xtfqc1yRdz4nwJ; Wed, 20 Nov 2024 11:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732103548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3tUsU9ia9K/NdIR61kN2drKi+cRKRk/99bJE1EOD3Dg=; b=R26YIIupDGkwVuYeKOL9VxNY0NUm1tjH9rhaKQRzL42RmF5jj3iCmI6pSXoDyps8DL7mmJ WfqZhACURw5A9uMrlIlV4OTxirV291bPrrl35uYNnLXvXuiWCKXiu/6CHqMUuxPSXc2q4m AIkZaStS+gXuITEiaeiwfi6bLneTejYmDeP5KbvK5FGTNwKCpC+8xLfJpzSrF+RRe0+y+A xnWrf47gRCvMyGRyOJf+D/l+Wkch8DfxmJ7Cm/B/1IjjSgG3ZNbd+QR5sL0Wubuq520Cz1 1bkkl6SfH5TM+rGCVoJ8mI5EGv0zfAX+bHp+RrGFRjtGC0f7sLkhsKqUhzt8Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732103548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3tUsU9ia9K/NdIR61kN2drKi+cRKRk/99bJE1EOD3Dg=; b=p6QxAT1ma0ItQR9M5iUX83Jj5WV1yJ943CHayTsWV3oSV3WhnF5TZBBsV4z70ipMLXXUKG svthjTQdgqvEDSrc4vOfUDucWxteeCZZAFVoOYqVHpZeYlIQfwsODuAgpgfnzO0WDFsxk9 sVPD2Vvh52ShCVUykYZHgSfEFZbFikWm3ZcxIOQuNJ+s4Gt2ebGIA5a0VSQHwpPuw9XVFM 6QmnTMwNWxmcqTwNMl0bnnp+dq9c/nNLbgJM8Dr3vIqAu4/cSRhsTLKDjKN1+DTf/1i7gu vtqExhpnR+6u+ZMoO6sL4zf/xC3yDxBeTpc59GddF5Z4L76hKsxmkExyW6hzJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732103548; a=rsa-sha256; cv=none; b=QN372Z0ELGdlGYCmdJ9W04juXd66PUOC9tEsIUXWwiiASqADQ56XZnSjDVajM6/gfhPwKY 0EkCydzgpSX7JtCRK6VEkfpxzwBz7Zj0O94vEdtkzUtgHTBYNZ3Hf1IgITuHsJ6G2N5Oy1 URusALAeb0eih05lmukKRaSiy15hy9QdT+x+tONS8NE3zRK4Sotx3vgrmWc94p64pPKDlX GSXIMbpmb2uce1pt3WzqP5wjVGVufau86JpeIsyWQnyi+wUMcr1oAYONo5rhh/V7vJqAkg sQTR85q5nEfAB3gt4UGfmsz20DuMEIKtmbgj0khiDvMk1u5P7+hc4DpxSR8fPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xtfqc1Z2Gzt2W; Wed, 20 Nov 2024 11:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AKBqSPk027902; Wed, 20 Nov 2024 11:52:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AKBqSZa027899; Wed, 20 Nov 2024 11:52:28 GMT (envelope-from git) Date: Wed, 20 Nov 2024 11:52:28 GMT Message-Id: <202411201152.4AKBqSZa027899@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: ddbaa6195e6b - main - devel/valgrind-devel: improve MPI library handling in plist for supported ARCHes List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ddbaa6195e6b027b95cc35d4f7ab067db75944f5 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ddbaa6195e6b027b95cc35d4f7ab067db75944f5 commit ddbaa6195e6b027b95cc35d4f7ab067db75944f5 Author: Dima Panov AuthorDate: 2024-11-20 11:51:38 +0000 Commit: Dima Panov 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 +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