Mercurial > mxe-octave

diff src/mingw-blas-1-xerbla.patch @ 5979:e617e117f94d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
BLAS: Update to version 3.10.0. * src/blas.mk: Update version and checksum. Adapt build rule to changes in Makefile. * src/mingw-blas-1-xerbla.patch: Rebase patch.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 25 Nov 2021 19:14:38 +0100
parents 80461a9e516c
children
line wrap: on
line diff
--- a/src/mingw-blas-1-xerbla.patch	Thu Nov 25 18:37:52 2021 +0100
+++ b/src/mingw-blas-1-xerbla.patch	Thu Nov 25 19:14:38 2021 +0100
@@ -1,47 +1,46 @@
 diff -uNr a/Makefile b/Makefile
---- a/Makefile	2017-11-15 00:39:21.000000000 -0500
-+++ b/Makefile	2018-06-20 09:55:02.049803368 -0400
-@@ -55,8 +55,8 @@
- #
- #######################################################################
+--- a/Makefile	2021-11-25 18:50:29.908859992 +0100
++++ b/Makefile	2021-11-25 18:54:00.741901186 +0100
+@@ -64,7 +64,7 @@
+ 	$(FC) $(FFLAGS) -c -o $@ $<
  
+ .PHONY: all
 -all: $(BLASLIB)
-- 
 +all: $(BLASLIB) $(XERBLALIB)
-+
- #---------------------------------------------------------
- #  Comment out the next 6 definitions if you already have
- #  the Level 1 BLAS.
-@@ -88,9 +88,11 @@
+ 
+ .PHONY: blas
+ blas: $(BLASLIB)
+@@ -104,9 +104,11 @@
  #  Level 2 and Level 3 BLAS.  Comment it out only if you already have
  #  both the Level 2 and 3 BLAS.
  #---------------------------------------------------------------------
--ALLBLAS  = lsame.o xerbla.o xerbla_array.o
-+ALLBLAS  = lsame.o xerbla_array.o
- $(ALLBLAS) : $(FRC)
+-ALLBLAS = lsame.o xerbla.o xerbla_array.o
++ALLBLAS = lsame.o xerbla_array.o
+ $(ALLBLAS): $(FRC)
  
 +XERBLA = xerbla.o
 +
  #---------------------------------------------------------
  #  Comment out the next 4 definitions if you already have
  #  the Level 2 BLAS.
-@@ -137,10 +139,16 @@
- 	$(CBLAS1) $(CBLAS2) $(CBLAS3) $(ZBLAS1) 	\
+@@ -153,10 +155,16 @@
+ 	$(CBLAS1) $(CBLAS2) $(CBLAS3) $(ZBLAS1) \
  	$(ZBLAS2) $(ZBLAS3) $(ALLBLAS)
  
 +XERBLAOBJ=$(XERBLA)
 +
  $(BLASLIB): $(ALLOBJ)
- 	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
+ 	$(AR) $(ARFLAGS) $@ $^
  	$(RANLIB) $@
  
 +$(XERBLALIB): $(XERBLAOBJ)
-+	$(ARCH) $(ARCHFLAGS) $@ $(XERBLAOBJ)
++	$(AR) $(ARFLAGS) $@ $^
 +	$(RANLIB) $@
 +
+ .PHONY: single double complex complex16
  single: $(SBLAS1) $(ALLBLAS) $(SBLAS2) $(SBLAS3)
- 	$(ARCH) $(ARCHFLAGS) $(BLASLIB) $(SBLAS1) $(ALLBLAS) \
- 	$(SBLAS2) $(SBLAS3)
+ 	$(AR) $(ARFLAGS) $(BLASLIB) $^
+
 diff -uNr a/make.inc b/make.inc
 --- a/make.inc	2011-04-19 15:08:00.000000000 -0400
 +++ b/make.inc	2018-06-20 09:55:18.185059266 -0400