view src/mingw-blas-1-xerbla.patch @ 4734:80461a9e516c

override default xerbla with version from Octave * mingw-blas-1-xerbla.patch, blas.mk: Build default libxerbla lib. * mingw-lapack-1-xerbla.patch, lapack.mk: Use external libxerbla. * mingw-openblas-1-xerbla.patch, openblas.mk: Likewise. * src/qrupdate-1-fixes.patch: Likewise. * default-octave.mk: Also install libxerbla.dll as libxerbla-octave.dll.
author John W. Eaton <jwe@octave.org>
date Thu, 21 Jun 2018 01:32:10 -0400
parents
children e617e117f94d
line wrap: on
line source

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 @@
 #
 #######################################################################
 
-all: $(BLASLIB)
- 
+all: $(BLASLIB) $(XERBLALIB)
+
 #---------------------------------------------------------
 #  Comment out the next 6 definitions if you already have
 #  the Level 1 BLAS.
@@ -88,9 +88,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)
 
+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) 	\
 	$(ZBLAS2) $(ZBLAS3) $(ALLBLAS)
 
+XERBLAOBJ=$(XERBLA)
+
 $(BLASLIB): $(ALLOBJ)
 	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
 	$(RANLIB) $@
 
+$(XERBLALIB): $(XERBLAOBJ)
+	$(ARCH) $(ARCHFLAGS) $@ $(XERBLAOBJ)
+	$(RANLIB) $@
+
 single: $(SBLAS1) $(ALLBLAS) $(SBLAS2) $(SBLAS3)
 	$(ARCH) $(ARCHFLAGS) $(BLASLIB) $(SBLAS1) $(ALLBLAS) \
 	$(SBLAS2) $(SBLAS3)
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
@@ -32,3 +32,4 @@
 #  The location and name of the Reference BLAS library.
 #
 BLASLIB      = blas$(PLAT).a
+XERBLALIB    = xerbla$(PLAT).a