With current CVS, the patch-aa for math/lapack (and math/blas) fails on my desktop Linux box. Apparently it has excessive context or something … stripping it a bit makes it more robust and does not change the actual edits. ===> Patching for blas-3.7.1 => Applying pkgsrc patches for blas-3.7.1 1 out of 2 hunks FAILED -- saving rejects to file SRC/Makefile.rej Patch /dev/shm/work-with-system-gcc/pkgsrc/cvs-20180309/pkgsrc/math/blas/../../math/lapack/patches/patch-aa failed ERROR: Patching failed due to modified or broken patch file(s): ERROR: /dev/shm/work-with-system-gcc/pkgsrc/cvs-20180309/pkgsrc/math/blas/../../math/lapack/patches/patch-aa It's bad that I see this now just after the release of 2018Q1, but well, it does not seem to be an issue for everyone. At least my GNU patch 2.7.5 does not like the patch in the release: shell$ tar -xf /distfiles/pkgsrc-2018Q1.tar.gz shell$ cd pkgsrc/math/lapack shell$ tar -xf /distfiles/lapack-3.7.1.tar.gz shell$ cd lapack-3.7.1/ shell$ patch -p0 < ../patches/patch-aa patching file SRC/Makefile Hunk #1 FAILED at 497. 1 out of 2 hunks FAILED -- saving rejects to file SRC/Makefile.rej The attached change fixes that for me. Alrighty then, Thomas -- Dr. Thomas Orgis Universität Hamburg RRZ / Basis-Infrastruktur / HPC Schlüterstr. 70 20146 Hamburg Tel.: 040/42838 8826 Fax: 040/428 38 6270
Index: math/lapack/distinfo =================================================================== RCS file: /cvsroot/pkgsrc/math/lapack/distinfo,v retrieving revision 1.21 diff -u -r1.21 distinfo --- math/lapack/distinfo 11 Sep 2017 20:56:28 -0000 1.21 +++ math/lapack/distinfo 5 Apr 2018 14:09:53 -0000 @@ -5,6 +5,6 @@ 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-aa) = 0edf7a1d54a6549fe77bb2e82a6b8b37fd7a4194 SHA1 (patch-ac) = 14945f2d5d18a6e310a2237ca413967dc5bdf4ff SHA1 (patch-ad) = 90e88c4e48c9effdfaf415691e2d3878effc3064 Index: math/lapack/patches/patch-aa =================================================================== RCS file: /cvsroot/pkgsrc/math/lapack/patches/patch-aa,v retrieving revision 1.12 diff -u -r1.12 patch-aa --- math/lapack/patches/patch-aa 11 Sep 2017 20:56:28 -0000 1.12 +++ math/lapack/patches/patch-aa 5 Apr 2018 14:09:53 -0000 @@ -1,21 +1,10 @@ -$NetBSD: patch-aa,v 1.12 2017/09/11 20:56:28 wiz Exp $ +$NetBSD$ Use LIBTOOL. ---- SRC/Makefile.orig 2017-06-17 22:46:53.000000000 +0000 -+++ SRC/Makefile -@@ -497,19 +497,19 @@ DEPRECSRC = DEPRECATED/cgegs.o DEPRECATE - ALLOBJ = $(SLASRC) $(DLASRC) $(DSLASRC) $(CLASRC) $(ZLASRC) $(ZCLASRC) \ - $(SCLAUX) $(DZLAUX) $(ALLAUX) - - ifdef USEXBLAS - ALLXOBJ = $(SXLASRC) $(DXLASRC) $(CXLASRC) $(ZXLASRC) - endif - - ifdef BUILD_DEPRECATED - DEPRECATED = $(DEPRECSRC) - endif - +--- SRC/Makefile.orig 2017-06-18 00:46:53.000000000 +0200 ++++ SRC/Makefile 2018-04-05 15:58:25.363429250 +0200 +@@ -508,8 +508,8 @@ all: ../$(LAPACKLIB) ../$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED) @@ -26,7 +15,7 @@ single: $(SLASRC) $(DSLASRC) $(SXLASRC) $(SCLAUX) $(ALLAUX) $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $^ -@@ -553,13 +553,13 @@ cleanlib: +@@ -553,13 +553,13 @@ rm -f ../$(LAPACKLIB) .f.o:
Attachment:
smime.p7s
Description: S/MIME cryptographic signature