Mercurial > mxe-octave

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4734
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 diff -uNr a/Makefile b/Makefile
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 --- a/Makefile 2017-11-15 00:39:21.000000000 -0500
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 +++ b/Makefile 2018-06-20 09:55:02.049803368 -0400
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 @@ -55,8 +55,8 @@
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 #
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 #######################################################################
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 -all: $(BLASLIB)
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 -
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 +all: $(BLASLIB) $(XERBLALIB)
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 +
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 #---------------------------------------------------------
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 # Comment out the next 6 definitions if you already have
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 # the Level 1 BLAS.
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 @@ -88,9 +88,11 @@
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 # Level 2 and Level 3 BLAS. Comment it out only if you already have
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 # both the Level 2 and 3 BLAS.
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 #---------------------------------------------------------------------
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 -ALLBLAS = lsame.o xerbla.o xerbla_array.o
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 +ALLBLAS = lsame.o xerbla_array.o
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 $(ALLBLAS) : $(FRC)
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 +XERBLA = xerbla.o
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 +
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 #---------------------------------------------------------
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 # Comment out the next 4 definitions if you already have
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 # the Level 2 BLAS.
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 @@ -137,10 +139,16 @@
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 $(CBLAS1) $(CBLAS2) $(CBLAS3) $(ZBLAS1) \
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 $(ZBLAS2) $(ZBLAS3) $(ALLBLAS)
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 +XERBLAOBJ=$(XERBLA)
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 +
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34 $(BLASLIB): $(ALLOBJ)
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35 $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36 $(RANLIB) $@
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38 +$(XERBLALIB): $(XERBLAOBJ)
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39 + $(ARCH) $(ARCHFLAGS) $@ $(XERBLAOBJ)
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40 + $(RANLIB) $@
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
41 +
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
42 single: $(SBLAS1) $(ALLBLAS) $(SBLAS2) $(SBLAS3)
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43 $(ARCH) $(ARCHFLAGS) $(BLASLIB) $(SBLAS1) $(ALLBLAS) \
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
44 $(SBLAS2) $(SBLAS3)
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
45 diff -uNr a/make.inc b/make.inc
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
46 --- a/make.inc 2011-04-19 15:08:00.000000000 -0400
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
47 +++ b/make.inc 2018-06-20 09:55:18.185059266 -0400
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
48 @@ -32,3 +32,4 @@
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49 # The location and name of the Reference BLAS library.
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
50 #
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
51 BLASLIB = blas$(PLAT).a
80461a9e516c override default xerbla with version from Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
52 +XERBLALIB = xerbla$(PLAT).a