Update blas and lapack to 3.7.1.

Reduce pkgsrc patches by depending on gmake.

No changelog found.

5 files changed, 48 insertions, 146 deletions

diff --git a/math/lapack/Makefile.common b/math/lapack/Makefile.common
index fbbb3087c19..7391c3e65e3 100644
--- a/math/lapack/Makefile.common
+++ b/math/lapack/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.7 2017/01/25 15:53:06 adam Exp $
+# $NetBSD: Makefile.common,v 1.8 2017/09/11 20:56:28 wiz Exp $
 # used by math/blas/Makefile
 # used by math/lapack/Makefile
 
-DISTNAME=	lapack-3.7.0
+DISTNAME=	lapack-3.7.1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_NETLIB:=lapack/}
 EXTRACT_SUFX=	.tgz
@@ -13,6 +13,7 @@ LICENSE=	modified-bsd
 
 USE_LANGUAGES=		c fortran
 USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake
 
 DISTINFO_FILE=	${.CURDIR}/../../math/lapack/distinfo
 PATCHDIR=	${.CURDIR}/../../math/lapack/patches
diff --git a/math/lapack/distinfo b/math/lapack/distinfo
index a03fff880a6..e35ad53faf4 100644
--- a/math/lapack/distinfo
+++ b/math/lapack/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.20 2017/01/25 15:53:06 adam Exp $
+$NetBSD: distinfo,v 1.21 2017/09/11 20:56:28 wiz Exp $
 
-SHA1 (lapack-3.7.0.tgz) = 27dbd06bedc76619150f8e28de6412f7df0c649a
-RMD160 (lapack-3.7.0.tgz) = 71841959ce7cd6a07e721a2de8ff29c89735b103
-SHA512 (lapack-3.7.0.tgz) = e4f4c7d0ba8a096eeb813160c6dbcdd535647df6b2ad5beac9181908158956b31d1a9554ec9b9836fd44fe7404c1f377b297cbb20d744f20d70e357fd246c91b
-Size (lapack-3.7.0.tgz) = 7359812 bytes
-SHA1 (patch-BLAS_SRC_Makefile) = daffb940f6ec0cd03dcce22799e27096a4d98607
-SHA1 (patch-aa) = e6a5a34a182d14a1859c9bf24823ab1f9cfabf2f
+SHA1 (lapack-3.7.1.tgz) = 84c4f7163b52b1bf1f6ca2193f6f48ed3dec0fab
+RMD160 (lapack-3.7.1.tgz) = db7d1e3cd904d01459db3c40bc613cb8738ad114
+SHA512 (lapack-3.7.1.tgz) = b16063146626d2f67ae1456a660dbb93f42d8387cfebef1bc2681a35b5d21d53120fb74b52932373d2423cd7df39a7ae4bbfc992a71addd936bbdd051d4e2eb7
+Size (lapack-3.7.1.tgz) = 9137261 bytes
+SHA1 (patch-BLAS_SRC_Makefile) = cf78648a8a1fe0320ad876a8d29e8f60defc07d7
+SHA1 (patch-aa) = 1b6bfd3737f8ee12334dcf0234ed75cc6253314d
 SHA1 (patch-ac) = 14945f2d5d18a6e310a2237ca413967dc5bdf4ff
-SHA1 (patch-ad) = aba4eae370d65e291b5cf6303cb9b4a6555a788c
+SHA1 (patch-ad) = 90e88c4e48c9effdfaf415691e2d3878effc3064
diff --git a/math/lapack/patches/patch-BLAS_SRC_Makefile b/math/lapack/patches/patch-BLAS_SRC_Makefile
index 852d948abb9..df4ab2d3c76 100644
--- a/math/lapack/patches/patch-BLAS_SRC_Makefile
+++ b/math/lapack/patches/patch-BLAS_SRC_Makefile
@@ -1,23 +1,23 @@
-$NetBSD: patch-BLAS_SRC_Makefile,v 1.4 2017/01/25 15:53:06 adam Exp $
+$NetBSD: patch-BLAS_SRC_Makefile,v 1.5 2017/09/11 20:56:28 wiz Exp $
 
 Use LIBTOOL.
 
---- BLAS/SRC/Makefile.orig	2016-12-23 23:01:32.000000000 +0000
+--- BLAS/SRC/Makefile.orig	2017-06-17 22:46:53.000000000 +0000
 +++ BLAS/SRC/Makefile
 @@ -138,8 +138,8 @@ ALLOBJ = $(SBLAS1) $(SBLAS2) $(SBLAS3) $
  	$(ZBLAS2) $(ZBLAS3) $(ALLBLAS)
  
  $(BLASLIB): $(ALLOBJ)
--	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
+-	$(ARCH) $(ARCHFLAGS) $@ $^
 -	$(RANLIB) $@
 +	${LIBTOOL} --mode=link --tag=FC ${FC} ${LDFLAGS} -o libblas.la \
 +	$(ALLOBJ:.o=.lo) -rpath ${PREFIX}/lib -version-info 4:0
  
  single: $(SBLAS1) $(ALLBLAS) $(SBLAS2) $(SBLAS3)
- 	$(ARCH) $(ARCHFLAGS) $(BLASLIB) $(SBLAS1) $(ALLBLAS) \
-@@ -168,4 +168,4 @@ clean:
- 	rm -f *.o
+ 	$(ARCH) $(ARCHFLAGS) $(BLASLIB) $^
+@@ -167,4 +167,4 @@ cleanlib:
+ 	#rm -f $(BLASLIB)  # May point to a system lib, e.g. -lblas
  
  .f.o:
 -	$(FORTRAN) $(OPTS) -c -o $@ $<
-+	${LIBTOOL} --mode=compile --tag=FC ${FC} ${FFLAGS} -c $<
++	${LIBTOOL} --mode=compile --tag=FC ${FC} ${FFLAGS} -c -o $@ $<
diff --git a/math/lapack/patches/patch-aa b/math/lapack/patches/patch-aa
index 7bea87e0af2..4c0c0e8d605 100644
--- a/math/lapack/patches/patch-aa
+++ b/math/lapack/patches/patch-aa
@@ -1,149 +1,50 @@
-$NetBSD: patch-aa,v 1.11 2017/01/25 15:53:06 adam Exp $
+$NetBSD: patch-aa,v 1.12 2017/09/11 20:56:28 wiz Exp $
 
-Fix ifdef/endif.
 Use LIBTOOL.
-Remove duplicate objects (one line).
 
---- SRC/Makefile.orig	2016-12-23 23:01:32.000000000 +0000
+--- SRC/Makefile.orig	2017-06-17 22:46:53.000000000 +0000
 +++ SRC/Makefile
-@@ -174,7 +174,7 @@ SLASRC = \
- 
- DSLASRC = spotrs.o sgetrs.o spotrf.o sgetrf.o
- 
--ifdef USEXBLAS
-+.ifdef USEXBLAS
- SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx_extended.o sla_geamv.o \
-    sla_gercond.o sla_gerpvgrw.o ssysvxx.o ssyrfsx.o \
-    sla_syrfsx_extended.o sla_syamv.o sla_syrcond.o sla_syrpvgrw.o \
-@@ -182,7 +182,7 @@ SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx
-    sla_porpvgrw.o sgbsvxx.o sgbrfsx.o sla_gbrfsx_extended.o \
-    sla_gbamv.o sla_gbrcond.o sla_gbrpvgrw.o sla_lin_berr.o slarscl2.o \
-    slascl2.o sla_wwaddw.o
--endif
-+.endif
- 
- CLASRC = \
-    cpotrf2.o cgetrf2.o \
-@@ -271,7 +271,7 @@ CLASRC = \
-    cheevd_2stage.o cheev_2stage.o cheevx_2stage.o cheevr_2stage.o \
-    chbev_2stage.o chbevx_2stage.o chbevd_2stage.o chegv_2stage.o
- 
--ifdef USEXBLAS
-+.ifdef USEXBLAS
- CXLASRC = cgesvxx.o cgerfsx.o cla_gerfsx_extended.o cla_geamv.o \
-    cla_gercond_c.o cla_gercond_x.o cla_gerpvgrw.o \
-    csysvxx.o csyrfsx.o cla_syrfsx_extended.o cla_syamv.o \
-@@ -283,7 +283,7 @@ CXLASRC = cgesvxx.o cgerfsx.o cla_gerfsx
-    chesvxx.o cherfsx.o cla_herfsx_extended.o cla_heamv.o \
-    cla_hercond_c.o cla_hercond_x.o cla_herpvgrw.o \
-    cla_lin_berr.o clarscl2.o clascl2.o cla_wwaddw.o
--endif
-+.endif
- 
- ZCLASRC = cpotrs.o cgetrs.o cpotrf.o cgetrf.o
- 
-@@ -366,7 +366,7 @@ DLASRC = \
-    dsyevd_2stage.o dsyev_2stage.o dsyevx_2stage.o dsyevr_2stage.o \
-    dsbev_2stage.o dsbevx_2stage.o dsbevd_2stage.o dsygv_2stage.o
- 
--ifdef USEXBLAS
-+.ifdef USEXBLAS
- DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx_extended.o dla_geamv.o \
-    dla_gercond.o dla_gerpvgrw.o dsysvxx.o dsyrfsx.o \
-    dla_syrfsx_extended.o dla_syamv.o dla_syrcond.o dla_syrpvgrw.o \
-@@ -374,7 +374,7 @@ DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx
-    dla_porpvgrw.o dgbsvxx.o dgbrfsx.o dla_gbrfsx_extended.o \
-    dla_gbamv.o dla_gbrcond.o dla_gbrpvgrw.o dla_lin_berr.o dlarscl2.o \
-    dlascl2.o dla_wwaddw.o
--endif
-+.endif
- 
- ZLASRC = \
-    zpotrf2.o zgetrf2.o \
-@@ -464,12 +464,11 @@ ZLASRC = \
-    zgelqt.o zgelqt3.o zgemlqt.o \
-    zgetsls.o zgeqr.o zlatsqr.o zlamtsqr.o zgemqr.o \
-    zgelq.o zlaswlq.o zlamswlq.o zgemlq.o \
--   ztplqt.o ztplqt2.o ztpmlqt.o \
-    zhetrd_2stage.o zhetrd_he2hb.o zhetrd_hb2st.o zhb2st_kernels.o \
-    zheevd_2stage.o zheev_2stage.o zheevx_2stage.o zheevr_2stage.o \
-    zhbev_2stage.o zhbevx_2stage.o zhbevd_2stage.o zhegv_2stage.o
- 
--ifdef USEXBLAS
-+.ifdef USEXBLAS
- ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o \
-    zla_gercond_c.o zla_gercond_x.o zla_gerpvgrw.o zsysvxx.o zsyrfsx.o \
-    zla_syrfsx_extended.o zla_syamv.o zla_syrcond_c.o zla_syrcond_x.o \
-@@ -479,7 +478,7 @@ ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx
-    zla_gbrpvgrw.o zhesvxx.o zherfsx.o zla_herfsx_extended.o \
-    zla_heamv.o zla_hercond_c.o zla_hercond_x.o zla_herpvgrw.o \
-    zla_lin_berr.o zlarscl2.o zlascl2.o zla_wwaddw.o
--endif
-+.endif
- 
- DEPRECSRC = DEPRECATED/cgegs.o DEPRECATED/cgegv.o DEPRECATED/cgelsx.o \
-    DEPRECATED/cgeqpf.o DEPRECATED/cggsvd.o DEPRECATED/cggsvp.o \
-@@ -497,19 +496,19 @@ DEPRECSRC = DEPRECATED/cgegs.o DEPRECATE
+@@ -497,19 +497,19 @@ DEPRECSRC = DEPRECATED/cgegs.o DEPRECATE
  ALLOBJ = $(SLASRC) $(DLASRC) $(DSLASRC) $(CLASRC) $(ZLASRC) $(ZCLASRC) \
     $(SCLAUX) $(DZLAUX) $(ALLAUX)
  
--ifdef USEXBLAS
-+.ifdef USEXBLAS
+ ifdef USEXBLAS
  ALLXOBJ = $(SXLASRC) $(DXLASRC) $(CXLASRC) $(ZXLASRC)
--endif
-+.endif
+ endif
  
--ifdef BUILD_DEPRECATED
-+.ifdef BUILD_DEPRECATED
+ ifdef BUILD_DEPRECATED
  DEPRECATED = $(DEPRECSRC)
--endif
-+.endif
+ endif
  
  all: ../$(LAPACKLIB)
  
  ../$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED)
--	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED)
+-	$(ARCH) $(ARCHFLAGS) $@ $^
 -	$(RANLIB) $@
 +	${LIBTOOL} --mode=link --tag=FC ${FC} ${LDFLAGS} -o ../$(LAPACKLIB) \
-+	$(ALLOBJ:.o=.lo) -rpath ${PREFIX}/lib -version-info 4:0
++	$(ALLOBJ:.o=.lo) $(ALLXOBJ:.o=.lo) $(DEPRECATED:.o=.lo) -rpath ${PREFIX}/lib -version-info 4:0
  
  single: $(SLASRC) $(DSLASRC) $(SXLASRC) $(SCLAUX) $(ALLAUX)
- 	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(DSLASRC) \
-@@ -540,12 +539,12 @@ $(DLASRC): $(FRC)
- $(ZLASRC): $(FRC)
- $(ZCLASRC): $(FRC)
- $(DSLASRC): $(FRC)
--ifdef USEXBLAS
-+.ifdef USEXBLAS
- $(SXLASRC): $(FRC)
- $(CXLASRC): $(FRC)
- $(DXLASRC): $(FRC)
- $(ZXLASRC): $(FRC)
--endif
-+.endif
- 
- FRC:
- 	@FRC=$(FRC)
-@@ -554,14 +553,14 @@ clean:
- 	rm -f *.o DEPRECATED/*.o
+ 	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $^
+@@ -553,13 +553,13 @@ cleanlib:
+ 	rm -f ../$(LAPACKLIB)
  
  .f.o:
 -	$(FORTRAN) $(OPTS) -c -o $@ $<
-+	${LIBTOOL} --mode=compile --tag=FC ${FC} ${FFLAGS} -c $<
- 
++	${LIBTOOL} --mode=compile --tag=FC ${FC} ${FFLAGS} -c -o $@ $<
  .F.o:
--	$(FORTRAN) $(OPTS) -c $< -o $@
-+	${LIBTOOL} --mode=compile --tag=FC ${FC} ${FFLAGS} -c $<
- 	
+-	$(FORTRAN) $(OPTS) -c -o $@ $<
++	${LIBTOOL} --mode=compile --tag=FC ${FC} ${FFLAGS} -c -o $@ $<
+ 
 -slaruv.o: slaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
 -dlaruv.o: dlaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
 -sla_wwaddw.o: sla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
 -dla_wwaddw.o: dla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
 -cla_wwaddw.o: cla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
 -zla_wwaddw.o: zla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
-+slaruv.o: slaruv.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c $< -o $@
-+dlaruv.o: dlaruv.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c $< -o $@
-+sla_wwaddw.o: sla_wwaddw.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c $< -o $@
-+dla_wwaddw.o: dla_wwaddw.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c $< -o $@
-+cla_wwaddw.o: cla_wwaddw.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c $< -o $@
-+zla_wwaddw.o: zla_wwaddw.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c $< -o $@
++slaruv.o: slaruv.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c -o $@ $<
++dlaruv.o: dlaruv.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c -o $@ $<
++sla_wwaddw.o: sla_wwaddw.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c -o $@ $<
++dla_wwaddw.o: dla_wwaddw.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c -o $@ $<
++cla_wwaddw.o: cla_wwaddw.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c -o $@ $<
++zla_wwaddw.o: zla_wwaddw.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c -o $@ $<
diff --git a/math/lapack/patches/patch-ad b/math/lapack/patches/patch-ad
index 8ea1e74314d..e8a802eb52b 100644
--- a/math/lapack/patches/patch-ad
+++ b/math/lapack/patches/patch-ad
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.5 2017/01/25 15:53:06 adam Exp $
+$NetBSD: patch-ad,v 1.6 2017/09/11 20:56:28 wiz Exp $
 
 Use LIBTOOL.
 
---- INSTALL/Makefile.orig	2016-12-23 23:01:32.000000000 +0000
+--- INSTALL/Makefile.orig	2017-06-17 22:46:53.000000000 +0000
 +++ INSTALL/Makefile
-@@ -29,7 +29,7 @@ testversion: ilaver.o LAPACK_version.o
- clean:
- 	rm -f *.o
+@@ -44,7 +44,7 @@ cleantest:
+ 
+ .SUFFIXES: .o .f
  .f.o:
 -	$(FORTRAN) $(OPTS) -c -o $@ $<
-+	${LIBTOOL} --mode=compile --tag=FC ${FC} ${FFLAGS} -c $<
++	${LIBTOOL} --mode=compile --tag=FC ${FC} ${FFLAGS} -c -o $@ $<
  
 -slamch.o: slamch.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
 -dlamch.o: dlamch.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
-+slamch.o: slamch.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c $< -o $@
-+dlamch.o: dlamch.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c $< -o $@
++slamch.o: slamch.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c -o $@ $<
++dlamch.o: dlamch.f ; ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c -o $@ $<