diff options
| -rw-r--r-- | math/blas/Makefile | 3 | ||||
| -rw-r--r-- | math/lapack/Makefile | 3 | ||||
| -rw-r--r-- | math/lapack/distinfo | 8 | ||||
| -rw-r--r-- | math/lapack/patches/patch-BLAS_SRC_Makefile | 6 | ||||
| -rw-r--r-- | math/lapack/patches/patch-aa | 18 | ||||
| -rw-r--r-- | math/lapack/patches/patch-ad | 8 |
6 files changed, 24 insertions, 22 deletions
diff --git a/math/blas/Makefile b/math/blas/Makefile index c7474296dc3..e703dcd41c6 100644 --- a/math/blas/Makefile +++ b/math/blas/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.32 2014/02/28 09:39:56 adam Exp $ +# $NetBSD: Makefile,v 1.33 2014/08/19 13:37:14 joerg Exp $ .include "../../math/lapack/Makefile.common" PKGNAME= ${DISTNAME:S/lapack/blas/} +PKGREVISION= 1 COMMENT= Basic Linear Algebra Subprograms (Fortran) diff --git a/math/lapack/Makefile b/math/lapack/Makefile index f4d7295e739..77159e26f82 100644 --- a/math/lapack/Makefile +++ b/math/lapack/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.36 2014/02/28 09:39:56 adam Exp $ +# $NetBSD: Makefile,v 1.37 2014/08/19 13:37:14 joerg Exp $ .include "Makefile.common" +PKGREVISION= 1 COMMENT= Linear Algebra PACKage BUILD_TARGET= lapacklib diff --git a/math/lapack/distinfo b/math/lapack/distinfo index b0192edf24b..653b176660a 100644 --- a/math/lapack/distinfo +++ b/math/lapack/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.16 2014/03/31 20:53:22 adam Exp $ +$NetBSD: distinfo,v 1.17 2014/08/19 13:37:14 joerg Exp $ SHA1 (lapack-3.5.0.tgz) = 5870081889bf5d15fd977993daab29cf3c5ea970 RMD160 (lapack-3.5.0.tgz) = d803308ef28f3c6cffb051850823395e2cb29b6a Size (lapack-3.5.0.tgz) = 6313139 bytes -SHA1 (patch-BLAS_SRC_Makefile) = 12cd125251976f93cf0f1625415f49d029c51451 -SHA1 (patch-aa) = 134069fa2e7d252fef50f18d2d2652aea1d6f8a6 +SHA1 (patch-BLAS_SRC_Makefile) = e0ee6f76e94352b05edac151c0a47f82e8773210 +SHA1 (patch-aa) = 54680fd0af562f21e2cfc4917c4f72c91dc504d7 SHA1 (patch-ac) = 14945f2d5d18a6e310a2237ca413967dc5bdf4ff -SHA1 (patch-ad) = 6805d2b7cb4485200e4ee4646df2a0bd4588a131 +SHA1 (patch-ad) = c8768f0efd2473b06251f2234b8b14951a9a877c diff --git a/math/lapack/patches/patch-BLAS_SRC_Makefile b/math/lapack/patches/patch-BLAS_SRC_Makefile index 44524bbf0f3..6370cf028db 100644 --- a/math/lapack/patches/patch-BLAS_SRC_Makefile +++ b/math/lapack/patches/patch-BLAS_SRC_Makefile @@ -1,4 +1,4 @@ -$NetBSD: patch-BLAS_SRC_Makefile,v 1.2 2014/03/31 20:53:22 adam Exp $ +$NetBSD: patch-BLAS_SRC_Makefile,v 1.3 2014/08/19 13:37:15 joerg Exp $ Use LIBTOOL. @@ -10,7 +10,7 @@ Use LIBTOOL. $(BLASLIB): $(ALLOBJ) - $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) - $(RANLIB) $@ -+ ${LIBTOOL} --mode=link --tag=CC ${FC} ${LDFLAGS} -o libblas.la \ ++ ${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) @@ -20,4 +20,4 @@ Use LIBTOOL. .f.o: - $(FORTRAN) $(OPTS) -c $< -o $@ -+ ${LIBTOOL} --mode=compile --tag=CC ${FC} ${FFLAGS} -c $< ++ ${LIBTOOL} --mode=compile --tag=FC ${FC} ${FFLAGS} -c $< diff --git a/math/lapack/patches/patch-aa b/math/lapack/patches/patch-aa index 86e5659ed27..4fce676385c 100644 --- a/math/lapack/patches/patch-aa +++ b/math/lapack/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.8 2014/02/28 09:39:56 adam Exp $ +$NetBSD: patch-aa,v 1.9 2014/08/19 13:37:15 joerg Exp $ Fix portability issues. Use LIBTOOL. @@ -89,7 +89,7 @@ Use LIBTOOL. ../$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ) - $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) - $(RANLIB) $@ -+ ${LIBTOOL} --mode=link --tag=F77 ${FC} ${LDFLAGS} -o ../$(LAPACKLIB) \ ++ ${LIBTOOL} --mode=link --tag=FC ${FC} ${LDFLAGS} -o ../$(LAPACKLIB) \ + $(ALLOBJ:.o=.lo) -rpath ${PREFIX}/lib -version-info 4:0 single: $(SLASRC) $(DSLASRC) $(SXLASRC) $(SCLAUX) $(ALLAUX) @@ -114,15 +114,15 @@ Use LIBTOOL. .f.o: - $(FORTRAN) $(OPTS) -c $< -o $@ -+ ${LIBTOOL} --mode=compile --tag=CC ${FC} ${FFLAGS} -c $< ++ ${LIBTOOL} --mode=compile --tag=FC ${FC} ${FFLAGS} -c $< + + -+slaruv.o: slaruv.f ; ${LIBTOOL} --mode=compile --tag=CC $(FC) $(NOOPT) -c $< -o $@ -+dlaruv.o: dlaruv.f ; ${LIBTOOL} --mode=compile --tag=CC $(FC) $(NOOPT) -c $< -o $@ -+sla_wwaddw.o: sla_wwaddw.f ; ${LIBTOOL} --mode=compile --tag=CC $(FC) $(NOOPT) -c $< -o $@ -+dla_wwaddw.o: dla_wwaddw.f ; ${LIBTOOL} --mode=compile --tag=CC $(FC) $(NOOPT) -c $< -o $@ -+cla_wwaddw.o: cla_wwaddw.f ; ${LIBTOOL} --mode=compile --tag=CC $(FC) $(NOOPT) -c $< -o $@ -+zla_wwaddw.o: zla_wwaddw.f ; ${LIBTOOL} --mode=compile --tag=CC $(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 $@ -slaruv.o: slaruv.f ; $(FORTRAN) $(NOOPT) -c $< -o $@ -dlaruv.o: dlaruv.f ; $(FORTRAN) $(NOOPT) -c $< -o $@ diff --git a/math/lapack/patches/patch-ad b/math/lapack/patches/patch-ad index 7238eca96b2..0b9cb5162d2 100644 --- a/math/lapack/patches/patch-ad +++ b/math/lapack/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.3 2014/02/28 09:39:56 adam Exp $ +$NetBSD: patch-ad,v 1.4 2014/08/19 13:37:15 joerg Exp $ --- INSTALL/Makefile.orig 2011-10-01 02:37:03.000000000 +0000 +++ INSTALL/Makefile @@ -12,9 +12,9 @@ $NetBSD: patch-ad,v 1.3 2014/02/28 09:39:56 adam Exp $ -slamch.o: slamch.f ; $(FORTRAN) $(NOOPT) -c $< -o $@ -dlamch.o: dlamch.f ; $(FORTRAN) $(NOOPT) -c $< -o $@ +.f.o: -+ ${LIBTOOL} --mode=compile --tag=CC ${FC} ${FFLAGS} -c $< ++ ${LIBTOOL} --mode=compile --tag=FC ${FC} ${FFLAGS} -c $< + +slamch.o: slamch.f -+ ${LIBTOOL} --mode=compile --tag=CC $(FC) $(NOOPT) -c $< -o $@ ++ ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c $< -o $@ +dlamch.o: dlamch.f -+ ${LIBTOOL} --mode=compile --tag=CC $(FC) $(NOOPT) -c $< -o $@ ++ ${LIBTOOL} --mode=compile --tag=FC $(FC) $(NOOPT) -c $< -o $@ |