From nobody Wed Sep 11 02:46:13 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 4X3Q1d69Nkz5VslH; Wed, 11 Sep 2024 02:46:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X3Q1d2b8qz4Wdf; Wed, 11 Sep 2024 02:46:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726022773; 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=JWygXV3KMzPZ0ttOeGcrMvSBux6mHtLNzGyHo4fBLxU=; b=ma9ITnfWpFw1qcHDsF/etXTqnxe6fET4PBo7FtKnVTV4yNOtzgBE7kGdp8hofEOP4sPo6Q neQiSltkSbSl+9Ru/yjmte4zeq+nqAyZyJZ6BL5EJntwX9/N4UIFVN4jeePyJJadZUFHzK zzvzJA70YOdyDXcFC/Bdh4Kb9CqLyArprclC+Q9G2xqcWORPoDJxCroqsyl0VWw6x9u1Ld VXjVyeA2u2AFCOBEFm+LnxR1iEUJ2jLtvckCkBdeIwf2Jbb9NROCqfMOvKiOntxVx/p3HE PCculZWZYPfK2yZBaljQcQutQm1YsijzidZL98Z5ZOZQFMHGk1aa/M///0YHYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726022773; a=rsa-sha256; cv=none; b=dB0HDfXctxjGWHTahC+9MOHVBb1sbqvEDRyE6bW0KEQ1ACQdI7Ptqa9opBGWPkUYmUetzd BDdQ/4Q/u9MWOhN/c9VDnf/8vfjFZiI6pVLFjGQWA/Sfsa+HAxicDPB6WJSo5O+/6iNbog DRypucg3twhJgAWUsaVao2kuRd0f31LMdpsj4bnlMuqflgSruMpA7BO4ejRDjPjKn5LnYc v0GeECgrDZoJgePJLIMpchxCRW8MawgC8i7/wIhvyxNcxA/2VXKBObCj/facvv1C728BpE NgX3o/TubImfxeVzAz6BaAwztk/z+EdGxInPnkvy5NNRvMa37oG+sc3GO83NXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726022773; 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=JWygXV3KMzPZ0ttOeGcrMvSBux6mHtLNzGyHo4fBLxU=; b=lnVZjjIEJnQTdTZOaHq+fL5eGuIaPqRKZpnbnorqI8pNrVhi33gAA31O9VTwrr48WCCZPM A7Aj67XUmK+zbgk+U3K5XxR+bwpPQwKW0YxB8xqxtdn7pVGfsuBTh3zFKN5R02kmaptTL9 C4KBZItuNppJRD+gyMQ5QfWLV7xtMbOXdy1PfJRi4vnhetHEPzjwx4ikKXcDCCx2HGTVFU CHsRMn4wzj8iZJ+c9W1FltHDiUdeoFO34kPWALifa2g5qitybA+Ds6ERPs4nBL8erW1olC D1gk8tyfcdVB0J2jblhBqK4U9mZN6F0BoA0oMRcsbqXE78SCXq38m1j49Eep9w== 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 4X3Q1d2C6Vz1Bt1; Wed, 11 Sep 2024 02:46:13 +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 48B2kD9G089959; Wed, 11 Sep 2024 02:46:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48B2kDGI089956; Wed, 11 Sep 2024 02:46:13 GMT (envelope-from git) Date: Wed, 11 Sep 2024 02:46:13 GMT Message-Id: <202409110246.48B2kDGI089956@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: d5450fe2bc97 - main - math/dbcsr: Correct plist; Use GCC to support OpenMP in dbcsr and cp2k; Correct options definition 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5450fe2bc97460ba5304a7f0dc88b47d39b9029 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=d5450fe2bc97460ba5304a7f0dc88b47d39b9029 commit d5450fe2bc97460ba5304a7f0dc88b47d39b9029 Author: Yuri Victorovich AuthorDate: 2024-09-11 02:31:27 +0000 Commit: Yuri Victorovich CommitDate: 2024-09-11 02:45:58 +0000 math/dbcsr: Correct plist; Use GCC to support OpenMP in dbcsr and cp2k; Correct options definition --- math/dbcsr/Makefile | 9 ++++++--- math/dbcsr/pkg-plist | 8 ++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/math/dbcsr/Makefile b/math/dbcsr/Makefile index 924676e7fd64..908f92fe2b7f 100644 --- a/math/dbcsr/Makefile +++ b/math/dbcsr/Makefile @@ -1,6 +1,7 @@ PORTNAME= dbcsr DISTVERSIONPREFIX= v DISTVERSION= 2.7.0 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -18,6 +19,7 @@ BUILD_DEPENDS= fypp:devel/py-fypp@${PY_FLAVOR} USES= blaslapack:openblas cmake:noninja,testing compiler:c++14-lang fortran \ python:build +USE_GCC= yes # OpenMP is used from both Forran and C code, therefore C code should be compiled with GCC, otherwise it fails at run-time (same in cp2k) USE_LDCONFIG= yes USE_GITHUB= yes @@ -32,18 +34,19 @@ CMAKE_ARGS= -DBLA_VENDOR:STRING="OpenBLAS" -DPython_EXECUTABLE=${PYTHON_CMD} BINARY_ALIAS= git=false # with git sonames get messed up -OPTIONS_DEFINE= MPIX OPENMP C_API # libxsmm is supposed to be supported, but cmake build lacks the corresponding option: https://github.com/cp2k/dbcsr/issues/73 -OPTIONS_DEFAULT= MPIX OPENMP C_API +OPTIONS_DEFINE= C_API MPIX OPENMP # libxsmm is supposed to be supported, but cmake build lacks the corresponding option: https://github.com/cp2k/dbcsr/issues/73 +OPTIONS_DEFAULT= C_API MPIX OPENMP OPTIONS_SUB= yes MPIX_DESC= Use OpenMPI -MPIX_CMAKE_BOOL= USE_MPI +MPIX_CMAKE_BOOL= USE_MPI USE_MPI_F08 MPIX_USES= mpi:mpich OPENMP_CMAKE_BOOL= USE_OPENMP C_API_DESC= Build the C API library C_API_CMAKE_BOOL= WITH_C_API +C_API_IMPLIES= MPIX # the ISO_C_BINDINGS require MPI unconditionally .include diff --git a/math/dbcsr/pkg-plist b/math/dbcsr/pkg-plist index cbb5dc0c1985..15152268d65a 100644 --- a/math/dbcsr/pkg-plist +++ b/math/dbcsr/pkg-plist @@ -1,6 +1,6 @@ %%C_API%%include/dbcsr.h include/dbcsr_api.mod -include/dbcsr_tensor.h +%%C_API%%include/dbcsr_tensor.h include/dbcsr_tensor_api.mod lib/cmake/dbcsr/DBCSRConfig.cmake lib/cmake/dbcsr/DBCSRConfigVersion.cmake @@ -9,6 +9,6 @@ lib/cmake/dbcsr/DBCSRTargets.cmake lib/libdbcsr.so lib/libdbcsr.so.2.7 lib/libdbcsr.so.2.7.0 -lib/libdbcsr_c.so -lib/libdbcsr_c.so.2.7 -lib/libdbcsr_c.so.2.7.0 +%%C_API%%lib/libdbcsr_c.so +%%C_API%%lib/libdbcsr_c.so.2.7 +%%C_API%%lib/libdbcsr_c.so.2.7.0