From nobody Tue Oct 12 20:52:20 2021 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 150D91806361; Tue, 12 Oct 2021 20:52:21 +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 4HTSXN6rlTz3MQs; Tue, 12 Oct 2021 20:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 CBCFA1B3EB; Tue, 12 Oct 2021 20:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19CKqK71066584; Tue, 12 Oct 2021 20:52:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19CKqKhS066583; Tue, 12 Oct 2021 20:52:20 GMT (envelope-from git) Date: Tue, 12 Oct 2021 20:52:20 GMT Message-Id: <202110122052.19CKqKhS066583@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 5a01079e224b - main - science/openmc: Unbreak LIBMESH option by switching to mpich 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a01079e224bafb6d19a74496fa78a0cb419eb46 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=5a01079e224bafb6d19a74496fa78a0cb419eb46 commit 5a01079e224bafb6d19a74496fa78a0cb419eb46 Author: Yuri Victorovich AuthorDate: 2021-10-12 20:50:53 +0000 Commit: Yuri Victorovich CommitDate: 2021-10-12 20:52:17 +0000 science/openmc: Unbreak LIBMESH option by switching to mpich As it turned out LibMesh fails to compile with OpenMPI-{3,4} --- science/openmc/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/science/openmc/Makefile b/science/openmc/Makefile index 178c65250c23..3e719d598ae4 100644 --- a/science/openmc/Makefile +++ b/science/openmc/Makefile @@ -1,6 +1,7 @@ PORTNAME= openmc DISTVERSIONPREFIX= v DISTVERSION= 0.12.2 +PORTREVISION= 1 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -29,11 +30,10 @@ OPTIONS_DEFAULT= MPI OPENMP LIBMESH_DESC= Support for libMesh unstructured mesh tallies LIBMESH_CMAKE_BOOL= libmesh LIBMESH_LIB_DEPENDS= libmesh_opt.so:math/libmesh -LIBMESH_BROKEN= https://github.com/openmc-dev/openmc/issues/1893 -MPI_VARS= CXX=${LOCALBASE}/mpi/openmpi/bin/mpic++ -MPI_BUILD_DEPENDS= openmpi>0:net/openmpi -MPI_RUN_DEPENDS= openmpi>0:net/openmpi +MPI_VARS= CXX=${LOCALBASE}/bin/mpic++ # compilation breaks with OpenMPI-{3,4} and LIBMESH=ON +MPI_BUILD_DEPENDS= mpich>0:net/mpich +MPI_RUN_DEPENDS= mpich>0:net/mpich OPENMP_CMAKE_BOOL= openmp