Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 May 2022 13:03:17 GMT
From:      Lorenzo Salvadore <salvadore@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 76eabb91bc3b - main - science/elmerfem: Fix build with GCC 11
Message-ID:  <202205061303.246D3HIN034166@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by salvadore:

URL: https://cgit.FreeBSD.org/ports/commit/?id=76eabb91bc3b4876351856d1f156d8611e6a4178

commit 76eabb91bc3b4876351856d1f156d8611e6a4178
Author:     Henrik Gulbrandsen <henrik@gulbra.net>
AuthorDate: 2022-05-05 00:46:53 +0000
Commit:     Lorenzo Salvadore <salvadore@FreeBSD.org>
CommitDate: 2022-05-06 13:01:10 +0000

    science/elmerfem: Fix build with GCC 11
    
    PR:     263539
    Reported by:    exp-run (antoine@)
    Approved by:    gerald (mentor)
---
 science/elmerfem/Makefile                          |  6 ++-
 .../patch-fem_src_modules_DCRComplexSolve.F90      | 58 ++++++++++++++++++++++
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/science/elmerfem/Makefile b/science/elmerfem/Makefile
index ca7a1c9c605f..7d42a1de33cd 100644
--- a/science/elmerfem/Makefile
+++ b/science/elmerfem/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	elmerfem
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 
 MAINTAINER=	henrik@gulbra.net
@@ -12,17 +12,19 @@ COMMENT=	Multiphysical simulation software
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libblas.so:math/blas \
+		libhdf5.so:science/hdf5 \
 		libmetis.so:math/metis \
 		libmpich.so:net/mpich \
+		libnetcdf.so:science/netcdf \
 		libopenblas.so:math/openblas \
 		libparpack.so:math/arpack-ng
 
 USES=		cmake compiler:c++11-lang fortran
-USE_LDCONFIG=	${PREFIX}/lib/elmersolver
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ElmerCSC
 
+USE_LDCONFIG=	${PREFIX}/lib/elmersolver
 CMAKE_ARGS=	-DELMER_FEM_REVISION:STRING=${GH_TAGNAME}
 
 ALL_TARGET=	# empty
diff --git a/science/elmerfem/files/patch-fem_src_modules_DCRComplexSolve.F90 b/science/elmerfem/files/patch-fem_src_modules_DCRComplexSolve.F90
new file mode 100644
index 000000000000..515d7d578f3e
--- /dev/null
+++ b/science/elmerfem/files/patch-fem_src_modules_DCRComplexSolve.F90
@@ -0,0 +1,58 @@
+--- fem/src/modules/DCRComplexSolve.F90.orig	2020-11-10 19:52:44 UTC
++++ fem/src/modules/DCRComplexSolve.F90
+@@ -433,6 +433,7 @@ CONTAINS
+ !------------------------------------------------------------------------------
+       LOGICAL :: FirstTime = .TRUE., stat
+       REAL(KIND=dp), POINTER :: Hwrk(:,:,:)
++      INTEGER :: i
+ 
+       SAVE FirstTime, Hwrk
+ !------------------------------------------------------------------------------
+@@ -485,6 +486,7 @@ CONTAINS
+ !------------------------------------------------------------------------------
+       LOGICAL :: FirstTime = .TRUE., stat
+       REAL(KIND=dp), POINTER :: Hwrk(:,:,:)
++      INTEGER :: i
+ 
+       SAVE FirstTime, Hwrk
+ !------------------------------------------------------------------------------
+@@ -1074,6 +1076,7 @@ contains
+ !------------------------------------------------------------------------------
+       LOGICAL :: FirstTime = .TRUE., stat
+       REAL(KIND=dp), POINTER :: Hwrk(:,:,:)
++      INTEGER :: i
+ 
+       SAVE FirstTime, Hwrk
+ !------------------------------------------------------------------------------
+@@ -1374,6 +1377,7 @@ contains
+ !------------------------------------------------------------------------------
+       LOGICAL :: FirstTime = .TRUE., stat
+       REAL(KIND=dp), POINTER :: Hwrk(:,:,:)
++      INTEGER :: i
+ 
+       SAVE FirstTime, Hwrk
+ !------------------------------------------------------------------------------
+@@ -1426,6 +1430,7 @@ contains
+ !------------------------------------------------------------------------------
+       LOGICAL :: FirstTime = .TRUE., stat
+       REAL(KIND=dp), POINTER :: Hwrk(:,:,:)
++      INTEGER :: i
+ 
+       SAVE FirstTime, Hwrk
+ !------------------------------------------------------------------------------
+@@ -1727,6 +1732,7 @@ CONTAINS
+ !------------------------------------------------------------------------------
+       LOGICAL :: FirstTime = .TRUE., stat
+       REAL(KIND=dp), POINTER :: Hwrk(:,:,:)
++      INTEGER :: i
+ 
+       SAVE FirstTime, Hwrk
+ !------------------------------------------------------------------------------
+@@ -1779,6 +1785,7 @@ CONTAINS
+ !------------------------------------------------------------------------------
+       LOGICAL :: FirstTime = .TRUE., stat
+       REAL(KIND=dp), POINTER :: Hwrk(:,:,:)
++      INTEGER :: i
+ 
+       SAVE FirstTime, Hwrk
+ !------------------------------------------------------------------------------



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205061303.246D3HIN034166>