From 2fa7da30fe30e268e652d6746f80847864e541ad Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Tue, 17 Jul 2018 14:58:05 +0000
Subject: When using g95, build brenner.f without optimisation to avoid ICE.
 Drop gfortran requirement.

---
 benchmarks/benchfft/Makefile         | 11 ++++++++---
 benchmarks/benchfft/distinfo         |  4 ++--
 benchmarks/benchfft/patches/patch-ad | 20 ++++++++++++++++----
 3 files changed, 26 insertions(+), 9 deletions(-)

(limited to 'benchmarks')

diff --git a/benchmarks/benchfft/Makefile b/benchmarks/benchfft/Makefile
index 50a0c603c91..d3147ad9f46 100644
--- a/benchmarks/benchfft/Makefile
+++ b/benchmarks/benchfft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2017/01/19 18:52:03 agc Exp $
+# $NetBSD: Makefile,v 1.41 2018/07/17 14:58:05 joerg Exp $
 
 DISTNAME=		benchfft-2.0
 PKGREVISION=		5
@@ -15,7 +15,6 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake csh:run
 USE_LANGUAGES=		c fortran77
 USE_LIBTOOL=		yes
-PKGSRC_FORTRAN=		gfortran
 
 LIBTOOL_OVERRIDE=	libtool ../fftw-*/libtool
 CONFIG_GUESS_OVERRIDE=	config.guess ../fftw-*/config.guess
@@ -34,7 +33,13 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/submit-script \
 		${DESTDIR}${PREFIX}/bin/run-fftbench
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/compiler.mk"
+
+.if defined(PKGSRC_FORTRAN) && !empty(PKGSRC_FORTRAN:Mg95)
+MAKE_ENV+=	G95_NO_OPT=-O0
+.else
+MAKE_ENV+=	G95_NO_OPT=
+.endif
 
 benchmark:
 .if defined(BATCH)
diff --git a/benchmarks/benchfft/distinfo b/benchmarks/benchfft/distinfo
index e96914a7fd6..007bf703a7c 100644
--- a/benchmarks/benchfft/distinfo
+++ b/benchmarks/benchfft/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 00:25:49 agc Exp $
+$NetBSD: distinfo,v 1.14 2018/07/17 14:58:05 joerg Exp $
 
 SHA1 (benchfft-2.0.tar.gz) = b49cbad9d390e54d3afe661d51d3dce7b3d6435e
 RMD160 (benchfft-2.0.tar.gz) = bd9ef45e633b8384c836e32e1e1cee877495bb26
@@ -11,7 +11,7 @@ Size (fftw-2.0.1.tar.gz) = 894543 bytes
 SHA1 (patch-aa) = 11c7d759af18a51da99231c964a079147656c9cc
 SHA1 (patch-ab) = 1c1be2e043ea9280f70dddd8082d20e929ea9d49
 SHA1 (patch-ac) = 24a1f01426f7e905f5033202b075786f2a632aa4
-SHA1 (patch-ad) = bb9d22c526a5f9ef4c187893a964ae2d0d71ea80
+SHA1 (patch-ad) = 7c168d745cfe76a0424fafd9eea760ccc642f540
 SHA1 (patch-ae) = afe38ba1f8d8d3497e5d6a8c722f4ab11b6f1c3a
 SHA1 (patch-af) = b301bdb6707f448fae83d1f0659ae966e3869027
 SHA1 (patch-ag) = a08153a6a8800184e7d186bf44a36f11372e853c
diff --git a/benchmarks/benchfft/patches/patch-ad b/benchmarks/benchfft/patches/patch-ad
index c2b7b4cbb80..e34b468865e 100644
--- a/benchmarks/benchfft/patches/patch-ad
+++ b/benchmarks/benchfft/patches/patch-ad
@@ -1,9 +1,9 @@
-$NetBSD: patch-ad,v 1.6 2012/01/12 12:36:13 hans Exp $
+$NetBSD: patch-ad,v 1.7 2018/07/17 14:58:05 joerg Exp $
 
 link required fortran library.
 
---- Makefile.in.orig	Tue Oct 20 12:42:00 1998
-+++ Makefile.in	Fri May 12 17:11:17 2000
+--- Makefile.in.orig	1998-10-20 16:42:00.000000000 +0000
++++ Makefile.in
 @@ -365,7 +365,7 @@ LIBPATHS = -L$(FFTWDIR)/fftw/.libs -L$(F
  INCLUDE_FLAGS = -I. -I$(FFTWDIR)/fftw -I$(FFTWDIR)/src -I$(FFTWDIR)/rfftw
  
@@ -21,7 +21,19 @@ link required fortran library.
  F90 = @F90@
  F90FLAGS = @FFLAGS@
  
-@@ -495,7 +496,7 @@ bench_utils.o: bench_utils.h bench-confi
+@@ -393,8 +394,10 @@ all: bench
+ 		-DFFLAGS="\"$(FFLAGS)\"" \
+ 		$< -o $@
+ 
++FFLAGS.f_source/brenner.f= $(G95_NO_OPT)
++
+ .f.o:
+-	$(F77) -c $(FFLAGS) $< -o $@
++	$(F77) -c $(FFLAGS) $(FFLAGS.$<) $< -o $@
+ 
+ ###########################################################################
+ 
+@@ -495,7 +498,7 @@ bench_utils.o: bench_utils.h bench-confi
  bench.o: bench_utils.h bench-config.h
  
  bench: $(OBJECTS)
-- 
cgit v1.2.3