Mercurial > mxe-octave

changeset 6921:7bfdd2c60a25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
suitesparse: Set configure flag for 64-bit Fortran integers (bug #64770). * src/suitesparse.mk: Set ALLOW_64BIT_BLAS when building with 64-bit Fortran integers. Remove flags that don't have an effect from build rules.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 12 Oct 2023 20:26:43 +0200
parents 90f4487f92f1
children c3eff9a45253
files src/suitesparse.mk
diffstat 1 files changed, 2 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/suitesparse.mk	Mon Oct 09 11:28:54 2023 -0400
+++ b/src/suitesparse.mk	Thu Oct 12 20:26:43 2023 +0200
@@ -23,14 +23,8 @@
 endef
 
 
-$(PKG)_CPPFLAGS := -DNTIMER
-
 ifeq ($(ENABLE_FORTRAN_INT64),yes)
-  ifeq ($(MXE_WINDOWS_BUILD),yes)
-    $(PKG)_CPPFLAGS += -DLONGBLAS='long long'
-  else
-    $(PKG)_CPPFLAGS += -DLONGBLAS='long'
-  endif
+  $(PKG)_CMAKE_FLAGS += -DALLOW_64BIT_BLAS=ON
 endif
 
 ifneq ($(MXE_NATIVE_BUILD),yes)
@@ -44,25 +38,19 @@
 endif
 
 $(PKG)_MAKE_OPTS = \
-    CPPFLAGS="$($(PKG)_CPPFLAGS)" \
     FFLAGS='$(MXE_FFLAGS)' \
     CFLAGS='$(MXE_CFLAGS)' \
     CXXFLAGS='$(MXE_CXXFLAGS)' \
     AR='$(MXE_AR)' \
     RANLIB='$(MXE_RANLIB)' \
-    CHOLMOD_CONFIG='-DNPARTITION' \
     CMAKE_OPTIONS='-DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" \
                    -DCOMPACT=ON -DNFORTRAN=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)'
 
-ifeq ($(MXE_WINDOWS_BUILD),yes)
-    $(PKG)_MAKE_OPTS += \
-        UNAME=Windows
-endif
-
 define $(PKG)_BUILD
     # build all
     $(MAKE) -C '$(1)' -j '$(JOBS)' \