Mercurial > mxe-octave
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 4733:1ecb1e67eaa1 | 4734:80461a9e516c |
|---|---|
| 1 diff -uNr a/Makefile b/Makefile | |
| 2 --- a/Makefile 2017-11-15 00:39:21.000000000 -0500 | |
| 3 +++ b/Makefile 2018-06-20 09:55:02.049803368 -0400 | |
| 4 @@ -55,8 +55,8 @@ | |
| 5 # | |
| 6 ####################################################################### | |
| 7 | |
| 8 -all: $(BLASLIB) | |
| 9 - | |
| 10 +all: $(BLASLIB) $(XERBLALIB) | |
| 11 + | |
| 12 #--------------------------------------------------------- | |
| 13 # Comment out the next 6 definitions if you already have | |
| 14 # the Level 1 BLAS. | |
| 15 @@ -88,9 +88,11 @@ | |
| 16 # Level 2 and Level 3 BLAS. Comment it out only if you already have | |
| 17 # both the Level 2 and 3 BLAS. | |
| 18 #--------------------------------------------------------------------- | |
| 19 -ALLBLAS = lsame.o xerbla.o xerbla_array.o | |
| 20 +ALLBLAS = lsame.o xerbla_array.o | |
| 21 $(ALLBLAS) : $(FRC) | |
| 22 | |
| 23 +XERBLA = xerbla.o | |
| 24 + | |
| 25 #--------------------------------------------------------- | |
| 26 # Comment out the next 4 definitions if you already have | |
| 27 # the Level 2 BLAS. | |
| 28 @@ -137,10 +139,16 @@ | |
| 29 $(CBLAS1) $(CBLAS2) $(CBLAS3) $(ZBLAS1) \ | |
| 30 $(ZBLAS2) $(ZBLAS3) $(ALLBLAS) | |
| 31 | |
| 32 +XERBLAOBJ=$(XERBLA) | |
| 33 + | |
| 34 $(BLASLIB): $(ALLOBJ) | |
| 35 $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) | |
| 36 $(RANLIB) $@ | |
| 37 | |
| 38 +$(XERBLALIB): $(XERBLAOBJ) | |
| 39 + $(ARCH) $(ARCHFLAGS) $@ $(XERBLAOBJ) | |
| 40 + $(RANLIB) $@ | |
| 41 + | |
| 42 single: $(SBLAS1) $(ALLBLAS) $(SBLAS2) $(SBLAS3) | |
| 43 $(ARCH) $(ARCHFLAGS) $(BLASLIB) $(SBLAS1) $(ALLBLAS) \ | |
| 44 $(SBLAS2) $(SBLAS3) | |
| 45 diff -uNr a/make.inc b/make.inc | |
| 46 --- a/make.inc 2011-04-19 15:08:00.000000000 -0400 | |
| 47 +++ b/make.inc 2018-06-20 09:55:18.185059266 -0400 | |
| 48 @@ -32,3 +32,4 @@ | |
| 49 # The location and name of the Reference BLAS library. | |
| 50 # | |
| 51 BLASLIB = blas$(PLAT).a | |
| 52 +XERBLALIB = xerbla$(PLAT).a |