From nobody Sat May 18 16:52:27 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 4VhVHc0DsWz5L7cM; Sat, 18 May 2024 16: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VhVHb5mxvz4HdK; Sat, 18 May 2024 16:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716051147; 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=A9NB/yBmREpnuEZ1HbvU6vYCiSSu8hYiHtk5wPH25ds=; b=CedvUSkc8wbubjS3yo9jkA/dA1eYb8Bx9SwAsp4qJiUijLCef9KIWHwh5DCx6VzUmhv3Vw S3h34Hzc+uSIigT93rbgwEDgFtrhh7fr5QOoBKiI7gIMVFl5oBT8Cr6gZa3EyqMH5jh0je pxOQlyv+kjL2XFVAUj/PMSvS/BURIP3DdEmNBkVYISP0KhwUo6TKraER+wLZzFbdeEmjwq MhBjPctrHm60P6H5mPlP2baRscdQ8ZFysQRRj4VmPXGaJs0tng5U3jeKmoWv1S/Uga0V/1 kGkX7xY74hoHbwtAPoYALWg4wZPfwxpxu5rtrFQ5h5iiAdHjE9icJA49H5o2MQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716051147; a=rsa-sha256; cv=none; b=RvR6OrjwYmtEDzD5WJGH6UAV24OYLtnTokw1TgemjbRR6HRVxmeIpoPqjsXhYBmcVfM2jX lJ9tFKP2+zA/l3bRTeCdAM9g6mfH9tsJFf9Iqmn6PzMkg2XWdi5Ou2/M11f4Pdee8S/YPg AmZRXdMz+QMecHfSeRRwRX+SLh8FYYt/9Vh7ajeKcC6KQpzjDbd0fqXrUs8f4Os/WqNVlx /aGNums54idJiOerGH4jdICGEfE1CZmurZx16cw2CCxyAh0xZGh2aS4fYxDQfoJ0MPP5Gq Pg1j3T5/8gnCkEJEkzMhsaLX1hsIZyktbarNyIe4nDv0vWt0qB8lWm44/qkDZQ== 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=1716051147; 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=A9NB/yBmREpnuEZ1HbvU6vYCiSSu8hYiHtk5wPH25ds=; b=ifhcxtmyJSSibbLHQKrmAHDWH+HYqWe6WtwqFyOBHCBQbD7haQI+lpATLmRqF/9Jx9W33l kFL3gVBjOMqUpn90rOLmJPRXNlQ0U26yUe/mSA20N4dl9RWouhhgUWzkZ1o6ocnScUN0Z+ IRFm8TPEhVH3d2tka8D103hePiNp3wsG+k4myZLj2z7gmBJoRU1hjZk3EfyC9wOiX9P2Ca 7Ol13/M5ouoo/3zWk7HE2iknWHng0ol/oCd8omMrZSRb0JxPuhqKHg4tzTpKhOjlJNZkMX M5W5sbPeeDVmbAW1PhRpVO5WQ8T7qAQ0zRRnSm3hwiIOQCqI5dLtiGS6q/4sqg== 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 4VhVHb5PL1zZfY; Sat, 18 May 2024 16:52:27 +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 44IGqR85067778; Sat, 18 May 2024 16:52:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44IGqR7o067775; Sat, 18 May 2024 16:52:27 GMT (envelope-from git) Date: Sat, 18 May 2024 16:52:27 GMT Message-Id: <202405181652.44IGqR7o067775@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: 5863a5b67a87 - main - science/gromacs: Fix build on systems without OpenMP 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: 5863a5b67a8702c0469342cc4ea26ec805d4564f Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=5863a5b67a8702c0469342cc4ea26ec805d4564f commit 5863a5b67a8702c0469342cc4ea26ec805d4564f Author: Yuri Victorovich AuthorDate: 2024-05-18 16:39:03 +0000 Commit: Yuri Victorovich CommitDate: 2024-05-18 16:52:20 +0000 science/gromacs: Fix build on systems without OpenMP Reported by: fallout --- science/gromacs/Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile index d51aaaa4cdb8..0c4668c264c1 100644 --- a/science/gromacs/Makefile +++ b/science/gromacs/Makefile @@ -33,13 +33,20 @@ CMAKE_ARGS= -DPython_EXECUTABLE=${PYTHON_CMD} \ TEST_TARGET= check -OPTIONS_DEFINE= ATLAS FLOAT HWLOC LEGACY OPENMP SIMD +OPTIONS_DEFINE= ATLAS FLOAT HWLOC LEGACY SIMD OPTIONS_SINGLE= MP OPENCL OPTIONS_SINGLE_MP= NOMP MPICH OPENMPI THREAD_MPI OPTIONS_SINGLE_OPENCL= OPENCL_NONE OPENCL_ICD OPENCL_SYCL -OPTIONS_DEFAULT= HWLOC LEGACY OPENCL_NONE OPENMP THREAD_MPI # FLOAT should not be a default because science/votca needs double precision. This is likely the same for many other uses. +OPTIONS_DEFAULT= HWLOC LEGACY OPENCL_NONE THREAD_MPI # FLOAT should not be a default because science/votca needs double precision. This is likely the same for many other uses. OPTIONS_SUB= yes +.if exists(/usr/include/omp.h) +OPTIONS_DEFINE+= OPENMP +OPTIONS_DEFAULT+= OPENMP +.else +CMAKE_OFF+= GMX_OPENMP +.endif + ATLAS_DESC= Use ATLAS for BLAS and LAPACK ATLAS_USES= blaslapack:atlas ATLAS_USES_OFF= blaslapack @@ -80,8 +87,6 @@ OPENCL_SYCL_LIB_DEPENDS= libhipSYCL-rt.so:lang/opensycl OPENCL_SYCL_IMPLIES= FLOAT OPENCL_SYCL_BROKEN= configure uses a wrong namespace to find CYCL, see https://gitlab.com/gromacs/gromacs/-/issues/4838 -OPENMP_CMAKE_BOOL= GMX_OPENMP - SIMD_CMAKE_OFF= -DGMX_SIMD:STRING="None" SIMD_CMAKE_ON= -DGMX_SIMD:STRING="AUTO" @@ -95,6 +100,7 @@ MPICH_CMAKE_ON= -DGMX_MPI:BOOL=ON \ -DMPI_C_COMPILER:FILEPATH="${LOCALBASE}/bin/mpicc" MPICH_PLIST_SUB= SUFFIX_MPI="_mpi" +OPENMP_CMAKE_BOOL= GMX_OPENMP OPENMPI_BUILD_DEPENDS= openmpi>0:net/openmpi OPENMPI_RUN_DEPENDS= openmpi>0:net/openmpi OPENMPI_CMAKE_ON= -DGMX_MPI:BOOL=ON \