From nobody Sun Feb 18 09:33:46 2024 X-Original-To: dev-commits-ports-all@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 4Td0py2dDYz5C4d8; Sun, 18 Feb 2024 09:33:46 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Td0py20vmz43nP; Sun, 18 Feb 2024 09:33:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708248826; 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=MgukoIo8JpXY1BltpWMy+U610M6hN8KayBFeN/bdpSk=; b=bZTirTwVhAjqCvqLuDVelZlJ7owKlDvSAr6BFPcMS9I5y3w4xp0BE9Gbe0kJg0JbelIOL7 0MwPxp+GSDf/bc2J0rqQLE7DfQvd5hczIhXvNZUzxKS7VtA6HWxa/NjOWwQVlYDtHzJSkh GmDVeIhsLIcqFkEx25lwNglGv7vYHqMD6Es80qpAEN+LtbBlM9hM3QgFtonPCfamcsS3P1 yKtYzhv/TEcKRnJUDLO2+gOtft0y3AdgCaUUkGaSMA7KivJ7TJfhtGY7+QpQWfeyGDUOa2 Nr1D5inDFO+PlrLzuuxMiFe3jSxkEDxa9Pry/fsPfYpqlKDBTvaqBqHCeE82kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708248826; 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=MgukoIo8JpXY1BltpWMy+U610M6hN8KayBFeN/bdpSk=; b=B/OsRTkiRAmLK/f7FvKFvplAUqlXcGNpsbMfQ0s/lBDUuHV8V2VYCeT5Xwquf+rC6J4ODj 8KYRbgednbBuf2oCgchq7b2tDKqp2fQcL0L1lcB3lCbes7T1iOhWZKCIeU1cud4xWsFaQ9 ldkheOpJ5s9sUhDkGe0dEPnXFKhfEgH1U73/SXziapONfEzOXTSLY/KUpoAXV71Gz0g8go vLWgK8YY+64ezvPH7Uu4UnPgWCclxniKWRUvky7nbabig73QNgCeJYzcB8GG55QNheIAzn kd9G/yyRRgqzVc72iEBukJISbgfBvi8DA4XM/dMMfkwYSsCZSik5FyIXB9E8LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708248826; a=rsa-sha256; cv=none; b=W8JM/6Z0h+aROnI2CsH0CQDaWYyMOjCJiaxaoM4U5MV+2uL982jncAIRfpsP5m0sEnEqGP hwgWgAP0T9cxVFuzjfklqU/QVMNkYVkE/keAzDNyox4QCh+IIjjOZ5EUD2P/DgWFNFuYM1 c7yeWVMy+xnUisNo/+x7n8XCfV8IQsK4Rl9xXYrfaA14l7xP3MOfnK/0QpurRIpR9EueMh QBBtDbgVqldIKcVaLLTrl+m8LdewaIFl4Dmk1SBfPyPYO/2LCms0y1RTyWj50bLmDfSEIr xupWuaJ4Iik2hyLLRGqOnMQSYD/rzOoXOsCupIa6tn1sukdrE+xbfTXD3egOOg== 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 4Td0py0Z7szm41; Sun, 18 Feb 2024 09:33:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41I9Xk81032724; Sun, 18 Feb 2024 09:33:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41I9Xk4k032721; Sun, 18 Feb 2024 09:33:46 GMT (envelope-from git) Date: Sun, 18 Feb 2024 09:33:46 GMT Message-Id: <202402180933.41I9Xk4k032721@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 0d309c1afa74 - main - Mk/Uses/mpi.mk: adapt the dependency on OpenMPI according to $ARCH List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d309c1afa7476e9aff4fd98b00cb8dbb79d402c Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=0d309c1afa7476e9aff4fd98b00cb8dbb79d402c commit 0d309c1afa7476e9aff4fd98b00cb8dbb79d402c Author: Thierry Thomas AuthorDate: 2024-01-26 10:33:41 +0000 Commit: Thierry Thomas CommitDate: 2024-02-18 09:22:34 +0000 Mk/Uses/mpi.mk: adapt the dependency on OpenMPI according to $ARCH --- Mk/Uses/mpi.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Mk/Uses/mpi.mk b/Mk/Uses/mpi.mk index 770e9d375f19..cf14ec675118 100644 --- a/Mk/Uses/mpi.mk +++ b/Mk/Uses/mpi.mk @@ -39,7 +39,11 @@ MPIF90= ${MPIFC} . endif MPI_CFLAGS+= `pkgconf --cflags mpich` . elif ${mpi_ARGS} == openmpi -LIB_DEPENDS+= libmpi_cxx.so:net/openmpi +. if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc +LIB_DEPENDS+= libmpi_cxx.so:net/openmpi4 +. else +LIB_DEPENDS+= libmpi_mpifh.so:net/openmpi +. endif MPI_HOME= ${LOCALBASE}/mpi/openmpi MPI4PY= ${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR} . if ${USES:Mfortran}