From nobody Fri May 20 22:03:04 2022 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 9C2C71AE899D; Fri, 20 May 2022 22:03:05 +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 4L4ghT0y9Qz3v6R; Fri, 20 May 2022 22:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653084185; 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=S9aISiO1Fpu5wEv08rQ/kArhT20R6OHAFytEur++MI8=; b=XpYes5+2FVwWwzJyacFX28bMwywl9PCYoenGfL8s2o/MgVUWrELKhy2aNt+/8KF6jLM/Kd /nZLKBxgRQ+Bvc7q0hePMoA3aSg682zA63REgZwKGd+GZW8NNRtLA2tx0J7TJ87pd2jkUC qtcLwSNzLrgWtykhJIUMG/AfQc7x2Kg/A+TVg2ff9lGOCTYDzHHvL3a/Mcbsh7O7N/gDbE BRgVwxWidtX/aKzvG/LEXNLVSmP+PwQ9ZHknnEdfuoBf/OBXJQ4dTUk6/sYrDsVSmW5/35 nSFW/d1uktWWeFgufO5YMv3x5G5gGVGOWPwE2eLBoK72bl/LR18Wdeg2cM5gVQ== 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 E22991A4BE; Fri, 20 May 2022 22:03:04 +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 24KM34a0037107; Fri, 20 May 2022 22:03:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24KM34kS037106; Fri, 20 May 2022 22:03:04 GMT (envelope-from git) Date: Fri, 20 May 2022 22:03:04 GMT Message-Id: <202205202203.24KM34kS037106@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: 47fb20c30c51 - main - math/moab: Fix MPI option 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47fb20c30c51fec8aec96ce9bcd6d2e94493f49d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653084185; 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=S9aISiO1Fpu5wEv08rQ/kArhT20R6OHAFytEur++MI8=; b=t0zKiXOSmzAundVvDRFbvtFr72pivFBAPvd2cNBA0ikF1I3kKTpkNubLs0qjxCtLIi+New /1GQoiQuO3OPFai1Ye5vB7RswVh7Ho8c+TVLWbUjwzxDnnNffu0N8Q8Z5/4ljZaumvNdbA 5E/k4Osbqb8XsN/ssZs6bavibsK2OH4AkA9Zr/oZPHmUfd9osQByeuSj5wsjjPxJxFLdAf 0JbObARKELzlZAibuU4tCRjf+Yh5ckN4fg6sgYlZVFQNIwsSz+LPtbTarm8qThUdqLvDh0 TW7R5Ir8PNsDGb5tjsTCiNzdAl4XXY3HNav0/iismI2rllcy5tjmvr9ZkJP1xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653084185; a=rsa-sha256; cv=none; b=QxgADKDMdBREa0GA+wImYzrx1ziqKn6z68+dD2NHQGD5shJuIk/UNafmB4Mt8qhZkUFwnx LanCdoT/6sFCGkOqkv3/0dn0tpwIwhKAQK10Fxd69sB/ObSDoOOI82tN8dD2+YfaGSt4sM cmNkFvJsc6UXec2uK77ctAjA2W31HjYXFJvjl2MC6obmiQq2XggRd/MEyVBonJXhSnB1tF +a73gQsLOgmCq5ensCBY/H+6+ldb72Zc73anFHE1NBmWQYal2a+usvIoE0CZe6k7/wcBOb BJsMKbQC1SRLVBglvqyCcWFYOwrzsdJRV1/K2L2qumi0r2NOs0jVetDovLrKYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=47fb20c30c51fec8aec96ce9bcd6d2e94493f49d commit 47fb20c30c51fec8aec96ce9bcd6d2e94493f49d Author: Yuri Victorovich AuthorDate: 2022-05-20 22:02:36 +0000 Commit: Yuri Victorovich CommitDate: 2022-05-20 22:03:00 +0000 math/moab: Fix MPI option --- math/moab/Makefile | 10 +++++++--- math/moab/files/patch-CMakeLists.txt | 3 +-- math/moab/pkg-plist | 5 +++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/math/moab/Makefile b/math/moab/Makefile index bce64266e692..29d81648abeb 100644 --- a/math/moab/Makefile +++ b/math/moab/Makefile @@ -1,5 +1,6 @@ PORTNAME= moab DISTVERSION= 5.3.1 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ @@ -13,7 +14,7 @@ LIB_DEPENDS= libhdf5.so:science/hdf5 \ libnetcdf.so:science/netcdf \ libopenblas.so:math/openblas -USES= cmake compiler:c++11-lang eigen:3 fortran +USES= cmake eigen:3 fortran USE_LDCONFIG= yes CMAKE_ARGS= -DBLAS_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so \ @@ -27,12 +28,15 @@ BB_COMMIT= 65880ffe833d WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT} OPTIONS_DEFINE= MPI -OPTIONS_DEFAULT= #MPI +OPTIONS_DEFAULT= MPI OPTIONS_SUB= yes MPI_CMAKE_BOOL= ENABLE_MPI MPI_LIB_DEPENDS= libmpi.so:net/openmpi -MPI_BROKEN= Build fails, see https://bitbucket.org/fathomteam/moab/issues/158/531-fails-to-build-with-openmpi-undefined +MPI_LDFLAGS= -L${LOCALBASE}/mpi/openmpi/lib +MPI_VARS= CXX=${LOCALBASE}/mpi/openmpi/bin/mpic++ CC=${LOCALBASE}/mpi/openmpi/bin/mpicc +OPENMPI_VARS= CONFLICTS_BUILD=mpich # otherwise bin/hexmodops gets linked with libmpi.so:net/mpich +OPENMPI_VARS_OFF= USES=compiler:c++11-lang post-install: # docs are just readmes diff --git a/math/moab/files/patch-CMakeLists.txt b/math/moab/files/patch-CMakeLists.txt index 32dc03a0a7bc..0c92f1b054cc 100644 --- a/math/moab/files/patch-CMakeLists.txt +++ b/math/moab/files/patch-CMakeLists.txt @@ -11,14 +11,13 @@ if ( MOAB_HAVE_FBIGEOM ) CONFIGURE_FILE(itaps/fbigeom/FBiGeom-Defs.inc.in "${PROJECT_BINARY_DIR}/lib/FBiGeom-Defs.inc" @ONLY) install( -@@ -636,23 +636,24 @@ if ( MOAB_HAVE_IMESH ) +@@ -636,23 +636,23 @@ if ( MOAB_HAVE_IMESH ) endif ( MOAB_HAVE_IMESH ) INSTALL( FILES "${PROJECT_BINARY_DIR}/lib/moab.make" - DESTINATION ${CMAKE_INSTALL_LIBDIR} + DESTINATION lib ) -+message(STATUS "YURI DESTDIR=${FREEBSD_STAGEDIR}") INSTALL( CODE - "file(APPEND ${CMAKE_INSTALL_FULL_LIBDIR}/moab.make MOAB_LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR}\\n )" diff --git a/math/moab/pkg-plist b/math/moab/pkg-plist index 820d40b77a4d..8b3bb286b66d 100644 --- a/math/moab/pkg-plist +++ b/math/moab/pkg-plist @@ -13,8 +13,6 @@ bin/mbsurfplot bin/mbtagprop bin/mbumr bin/spheredecomp -%%MPI%%include/Coupler.hpp -%%MPI%%include/ElemUtil.hpp include/MBCN.h include/MBCN_protos.h include/MBEntityType.h @@ -30,6 +28,8 @@ include/iMesh.h include/iMesh_extensions.h include/iMesh_f.h include/iMesh_protos.h +%%MPI%%include/mbcoupler/Coupler.hpp +%%MPI%%include/mbcoupler/ElemUtil.hpp include/moab/AdaptiveKDTree.hpp include/moab/BSPTree.hpp include/moab/BSPTreePoly.hpp @@ -80,6 +80,7 @@ include/moab/NestedRefine.hpp include/moab/NestedRefineTemplates.hpp include/moab/OrientedBox.hpp include/moab/OrientedBoxTreeTool.hpp +%%MPI%%include/moab/ParCommGraph.hpp %%MPI%%include/moab/ParallelComm.hpp %%MPI%%include/moab/ParallelData.hpp %%MPI%%include/moab/ParallelMergeMesh.hpp