Mercurial > mxe-octave

changeset 6925:2d1dfa0d7370

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SuiteSparse: Update to 7.2.1 * src/suitesparse.mk: Update version and checksum. Remove cross-compilation hints that are no longer needed. Build without OpenMP to use same threading model as OpenBLAS (that we build without OpenMP, too). Optionally, don't build static libraries.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 13 Oct 2023 19:55:32 +0200
parents f04699caf98e
children 7fb9150a8b5c
files src/suitesparse.mk
diffstat 1 files changed, 5 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/suitesparse.mk	Fri Oct 13 07:41:16 2023 -0400
+++ b/src/suitesparse.mk	Fri Oct 13 19:55:32 2023 +0200
@@ -2,8 +2,8 @@
 # See index.html for further information.
 
 PKG             := suitesparse
-$(PKG)_VERSION  := 7.2.0
-$(PKG)_CHECKSUM := cb79ed80422b1808b4a5aba27f5878ef84c82f56
+$(PKG)_VERSION  := 7.2.1
+$(PKG)_CHECKSUM := b14f590ffbc4c50962bbfb45fa4ffb130743bd4e
 $(PKG)_SUBDIR   := SuiteSparse-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_URL      := https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v$($(PKG)_VERSION).tar.gz
@@ -27,14 +27,8 @@
   $(PKG)_CMAKE_FLAGS += -DALLOW_64BIT_BLAS=ON
 endif
 
-ifneq ($(MXE_NATIVE_BUILD),yes)
-  ifeq ($(MXE_WINDOWS_BUILD),yes)
-    # The corresponding test (in GraphBLAS) succeeds on Windows (MinGW-w64).
-    $(PKG)_CMAKE_CROSS_FLAGS += -DHAVE_GETENV_HOME=ON
-  else
-    # Use fallback for other targets.
-    $(PKG)_CMAKE_CROSS_FLAGS += -DHAVE_GETENV_HOME=OFF
-  endif
+ifneq ($(BUILD_STATIC),yes)
+  $(PKG)_CMAKE_FLAGS += -DNSTATIC=ON
 endif
 
 $(PKG)_MAKE_OPTS = \
@@ -44,11 +38,10 @@
     AR='$(MXE_AR)' \
     RANLIB='$(MXE_RANLIB)' \
     CMAKE_OPTIONS='-DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" \
-                   -DCOMPACT=ON -DNFORTRAN=ON \
+                   -DCOMPACT=ON -DNOPENMP=ON \
                    -DBLA_VENDOR="Generic" -DBLAS_LIBRARIES="-lblas -lgfortran" -DLAPACK_LIBRARIES="-llapack" \
                    -DENABLE_CUDA=OFF \
                    $($(PKG)_CMAKE_FLAGS) \
-                   $($(PKG)_CMAKE_CROSS_FLAGS) \
                    $(CMAKE_CCACHE_FLAGS) $(CMAKE_BUILD_SHARED_OR_STATIC)'
 
 define $(PKG)_BUILD