Mercurial > mxe-octave

changeset 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 1569a1d140ae
children d256d1c6f55b
files src/blas.mk src/mingw-blas-1-xerbla.patch
diffstat 2 files changed, 42 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/src/blas.mk	Thu Nov 25 18:37:52 2021 +0100
+++ b/src/blas.mk	Thu Nov 25 19:14:38 2021 +0100
@@ -3,8 +3,8 @@
 
 PKG             := blas
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.8.0
-$(PKG)_CHECKSUM := ee21dc04e563f50ccf173c957f98d2ff47702cb4
+$(PKG)_VERSION  := 3.10.0
+$(PKG)_CHECKSUM := dbb9d61c51c322b5e19542aaa2bb4b02b95a774b
 $(PKG)_SUBDIR   := BLAS-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tgz
 $(PKG)_URL      := http://www.netlib.org/$(PKG)/$($(PKG)_FILE)
@@ -28,22 +28,27 @@
 endif
 
 define $(PKG)_BUILD
-    $(SED) -i 's,$$(FORTRAN),$(MXE_F77) $(MXE_F77_PICFLAG) $($(PKG)_DEFAULT_INTEGER_8_FLAG),g' '$(1)/Makefile'
-    $(MAKE) -C '$(1)' ARCH=$(MXE_AR) RANLIB=$(MXE_RANLIB) $($(PKG)_TARGETS) -j '$(JOBS)'
+  $(MAKE) -C '$(1)' \
+    FC=$(MXE_F77) \
+    FFLAGS='$(MXE_F77_PICFLAG) $($(PKG)_DEFAULT_INTEGER_8_FLAG)' \
+    AR=$(MXE_AR) \
+    RANLIB=$(MXE_RANLIB) \
+    $($(PKG)_TARGETS) \
+    -j '$(JOBS)'
 
-    if [ $(BUILD_SHARED) = yes ]; then \
-      if [ -n "$($(PKG)_LIBXERBLA)" ]; then \
-        $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/libxerbla.a' --install '$(INSTALL)' --libdir '$(3)$(HOST_LIBDIR)' --bindir '$(3)$(HOST_BINDIR)'; \
-        $(INSTALL) '$(3)/$(HOST_BINDIR)/libxerbla.dll' '$(3)$(HOST_BINDIR)/libxerbla-blas.dll'; \
-      fi; \
-      $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/libblas.a' --install '$(INSTALL)' --libdir '$(3)$(HOST_LIBDIR)' --bindir '$(3)$(HOST_BINDIR)' $($(PKG)_LIBXERBLA); \
-    fi
+  if [ $(BUILD_SHARED) = yes ]; then \
+    if [ -n "$($(PKG)_LIBXERBLA)" ]; then \
+      $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/libxerbla.a' --install '$(INSTALL)' --libdir '$(3)$(HOST_LIBDIR)' --bindir '$(3)$(HOST_BINDIR)'; \
+      $(INSTALL) '$(3)/$(HOST_BINDIR)/libxerbla.dll' '$(3)$(HOST_BINDIR)/libxerbla-blas.dll'; \
+    fi; \
+    $(MAKE_SHARED_FROM_STATIC) --ar '$(MXE_AR)' --ld '$(MXE_F77)' '$(1)/libblas.a' --install '$(INSTALL)' --libdir '$(3)$(HOST_LIBDIR)' --bindir '$(3)$(HOST_BINDIR)' $($(PKG)_LIBXERBLA); \
+  fi
 
-    if [ $(BUILD_STATIC) = yes ]; then \
-      $(INSTALL) -d '$(3)$(HOST_LIBDIR)'; \
-      $(INSTALL) '$(1)/libblas.a' '$(3)$(HOST_LIBDIR)/'; \
-      if [ -n "$($(PKG)_LIBXERBLA)" ]; then \
-        $(INSTALL) '$(1)/libxerbla.a' '$(3)$(HOST_LIBDIR)/'; \
-      fi; \
-    fi
+  if [ $(BUILD_STATIC) = yes ]; then \
+    $(INSTALL) -d '$(3)$(HOST_LIBDIR)'; \
+    $(INSTALL) '$(1)/libblas.a' '$(3)$(HOST_LIBDIR)/'; \
+    if [ -n "$($(PKG)_LIBXERBLA)" ]; then \
+      $(INSTALL) '$(1)/libxerbla.a' '$(3)$(HOST_LIBDIR)/'; \
+    fi; \
+  fi
 endef
--- 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