From owner-svn-ports-all@freebsd.org  Tue Nov 17 22:32:33 2020
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3AE6E471290;
 Tue, 17 Nov 2020 22:32:33 +0000 (UTC)
 (envelope-from linimon@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 "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CbLKs1CNkz3nn1;
 Tue, 17 Nov 2020 22:32:33 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1C5CA27B00;
 Tue, 17 Nov 2020 22:32:33 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AHMWXNO019061;
 Tue, 17 Nov 2020 22:32:33 GMT (envelope-from linimon@FreeBSD.org)
Received: (from linimon@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AHMWWsI019059;
 Tue, 17 Nov 2020 22:32:32 GMT (envelope-from linimon@FreeBSD.org)
Message-Id: <202011172232.0AHMWWsI019059@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: linimon set sender to
 linimon@FreeBSD.org using -f
From: Mark Linimon <linimon@FreeBSD.org>
Date: Tue, 17 Nov 2020 22:32:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r555601 - in head/science/elk: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: linimon
X-SVN-Commit-Paths: in head/science/elk: . files
X-SVN-Commit-Revision: 555601
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Nov 2020 22:32:33 -0000

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