Mercurial > mxe-octave

changeset 5569:c93838f0bcf2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make OpenBLAS build rule independent of build system (bug #59206). * src/openblas.mk: Update to v0.3.12. Explicitly set TARGET and NUM_THREADS. * src/mingw-openblas-1-xerbla.patch: Remove diff that does not apply and does not seem to be necessary any longer.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 27 Oct 2020 17:46:42 +0100
parents ee3807ebbd74
children e50a3ed99da0
files src/mingw-openblas-1-xerbla.patch src/openblas.mk
diffstat 2 files changed, 25 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/src/mingw-openblas-1-xerbla.patch	Sun Oct 25 10:05:20 2020 -0400
+++ b/src/mingw-openblas-1-xerbla.patch	Tue Oct 27 17:46:42 2020 +0100
@@ -51,15 +51,3 @@
  parameter.$(PSUFFIX) : parameter.c ../../param.h
  	$(CC) $(PFLAGS) -c $< -o $(@F)
  
-Only in OpenBLAS-0.3.8/driver/others: .Makefile.swp
-diff -ur OpenBLAS-0.3.8.orig/exports/gensymbol OpenBLAS-0.3.8/exports/gensymbol
---- OpenBLAS-0.3.8.orig/exports/gensymbol	2020-02-14 10:39:58.168130561 -0500
-+++ OpenBLAS-0.3.8/exports/gensymbol	2020-02-14 10:42:38.344240243 -0500
-@@ -38,7 +38,6 @@
-     zhbmv,zhemm,zhemv,zher2,zher2k,zher,zherk,zhpmv,zhpr2,
-     zhpr,zrotg,zscal,zswap,zsymm,zsyr2k,zsyrk,ztbmv,
-     ztbsv,ztpmv,ztpsv,ztrmm,ztrmv,ztrsm,ztrsv,
--    xerbla,
-     saxpby,daxpby,caxpby,zaxpby,
-     sgeadd,dgeadd,cgeadd,zgeadd,
-     somatcopy,
--- a/src/openblas.mk	Sun Oct 25 10:05:20 2020 -0400
+++ b/src/openblas.mk	Tue Oct 27 17:46:42 2020 +0100
@@ -3,14 +3,18 @@
 
 PKG             := openblas
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.3.10
-$(PKG)_CHECKSUM := cbe3fdd0e6ee235debc611d76976dac62f3ddc1c
+$(PKG)_VERSION  := 0.3.12
+$(PKG)_CHECKSUM := ae647fed597ae891a7f122b9ddc6b15d4b7e0656
 $(PKG)_SUBDIR   := OpenBLAS-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_URL      := https://github.com/xianyi/OpenBLAS/archive/v$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := blas
 
-$(PKG)_MAKE_OPTS := PREFIX=$(HOST_PREFIX) DYNAMIC_ARCH=1 NO_LAPACK=1
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'https://github.com/xianyi/OpenBLAS/tags' | \
+    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -Vr | \
+    head -1
+endef
 
 ifeq ($(USE_CCACHE),yes)
   $(PKG)_MXE_CC := $(shell basename $(MXE_CC))
@@ -20,27 +24,34 @@
   $(PKG)_MXE_F77 := $(MXE_F77)
 endif
 
-ifeq ($(MXE_NATIVE_BUILD),yes)
-  ## This may also be needed on some systems: NO_AVX2=1
-  $(PKG)_MAKE_OPTS += NO_CBLAS=1 USE_THREAD=1 CC=$($(PKG)_MXE_CC) FC=$($(PKG)_MXE_F77)
-else
-  $(PKG)_MAKE_OPTS += NO_CBLAS=1 USE_THREAD=1 CC=$($(PKG)_MXE_CC) FC=$($(PKG)_MXE_F77) HOSTCC=gcc HOSTFC=gfortran CROSS=1 CROSS_SUFFIX=$(MXE_TOOL_PREFIX)
+$(PKG)_MAKE_OPTS := \
+  PREFIX=$(HOST_PREFIX) \
+  DYNAMIC_ARCH=1 DYNAMIC_OLDER=1 \
+  NO_LAPACK=1 NO_CBLAS=1 \
+  USE_THREAD=1 NUM_THREADS=24 \
+  CC=$($(PKG)_MXE_CC) FC=$($(PKG)_MXE_F77)
+## This may also be needed on some systems: NO_AVX2=1
+
+ifneq ($(MXE_NATIVE_BUILD),yes)
+  $(PKG)_MAKE_OPTS += HOSTCC=gcc HOSTFC=gfortran CROSS=1 CROSS_SUFFIX=$(MXE_TOOL_PREFIX)
 endif
 
+## Assume that native builds are for a 64bit target
+$(PKG)_TARGET := PRESCOTT
+
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   $(PKG)_MAKE_OPTS += EXTRALIB=-lxerbla
+  ifneq ($(ENABLE_WINDOWS_64),yes)
+    $(PKG)_TARGET := KATMAI
+  endif
 endif
 
+$(PKG)_MAKE_OPTS += TARGET=$($(PKG)_TARGET)
+
 ifeq ($(ENABLE_FORTRAN_INT64),yes)
   $(PKG)_MAKE_OPTS += BINARY=64 INTERFACE64=1
 endif
 
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/xianyi/OpenBLAS/tags' | \
-    $(SED) -n 's|.*releases/tag/v\([^"]*\).*|\1|p' | $(SORT) -Vr | \
-    head -1
-endef
-
 define $(PKG)_BUILD
     $(MAKE) -C '$(1)' -j '$(JOBS)' $($(PKG)_MAKE_OPTS)  
     $(MAKE) -C '$(1)' -j 1 $($(PKG)_MAKE_OPTS) install