svn commit: r555601 - in head/science/elk: . files
Mark Linimon
linimon at FreeBSD.org
Tue Nov 17 22:32:33 UTC 2020
Author: linimon
Date: Tue Nov 17 22:32:32 2020
New Revision: 555601
URL: https://svnweb.freebsd.org/changeset/ports/555601
Log:
Add workaround for new failure with Fortran GCC 10 frontend:
Type mismatch in argument 'cc' at (1); passed COMPLEX(8) to REAL(8)
PR: 246700
Approved by: maintainer
Modified:
head/science/elk/Makefile
head/science/elk/files/make.inc.in
Modified: head/science/elk/Makefile
==============================================================================
--- head/science/elk/Makefile Tue Nov 17 22:28:16 2020 (r555600)
+++ head/science/elk/Makefile Tue Nov 17 22:32:32 2020 (r555601)
@@ -39,8 +39,17 @@ MAKE_JOBS_UNSAFE= yes
PLIST_FILES= bin/${PORTNAME}
+.include <bsd.port.pre.mk>
+
+.if ${GCC_DEFAULT} >= 10
+# workaround for Type mismatch in argument 'cc' at (1); passed COMPLEX(8) to REAL(8)
+FCFLAGS+= -fallow-argument-mismatch
+.endif
+
post-patch:
- @${SED} 's|%%GMAKE%%|${GMAKE}|; s|%%FC%%|${FC}|; s|%%OPENMP_FLAGS%%|${OPENMP_FLAGS}|' \
+ @${SED} 's|%%GMAKE%%|${GMAKE}|; s|%%FC%%|${FC}|; \
+ s|%%FCFLAGS%%|${FCFLAGS}|; \
+ s|%%OPENMP_FLAGS%%|${OPENMP_FLAGS}|' \
< ${FILESDIR}/make.inc.in \
> ${WRKSRC}/make.inc
@@ -58,4 +67,4 @@ do-install-EXAMPLES-on:
do-test:
@cd ${WRKSRC}/tests && ./tests.sh
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: head/science/elk/files/make.inc.in
==============================================================================
--- head/science/elk/files/make.inc.in Tue Nov 17 22:28:16 2020 (r555600)
+++ head/science/elk/files/make.inc.in Tue Nov 17 22:32:32 2020 (r555601)
@@ -1,7 +1,7 @@
MAKE = %%GMAKE%%
F90 = %%FC%%
-F90_OPTS = -O3 -ffast-math -funroll-loops %%OPENMP_FLAGS%%
+F90_OPTS = -O3 -ffast-math -funroll-loops %%OPENMP_FLAGS%% %%FCFLAGS%%
F77 = %%FC%%
F77_OPTS = -O3 -ffast-math -funroll-loops %%OPENMP_FLAGS%%
AR = ar
More information about the svn-ports-head
mailing list