Mercurial > mxe-octave
changeset 5241:a40ac891cab2
Update SuiteSparse to v5.6.0
* src/suitesparse.mk: Update version to 5.6.0. Update checksum and download url.
Update build rule.
* src/suitesparse-1-fixes.patch: Remove patch merged upstream. Don't build
Mongoose that doesn't handle 64bit indexing with "long long" correctly.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sun, 22 Dec 2019 13:06:42 +0100 |
parents | 5a6318b5b71d |
children | 8e7bc9f20163 |
files | src/suitesparse-1-fixes.patch src/suitesparse.mk |
diffstat | 2 files changed, 74 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/src/suitesparse-1-fixes.patch Tue Dec 17 13:05:13 2019 -0500 +++ b/src/suitesparse-1-fixes.patch Sun Dec 22 13:06:42 2019 +0100 @@ -697,23 +697,70 @@ $(RM) $(INSTALL_DOC)/UMFPACK_UserGuide.pdf $(RM) $(INSTALL_DOC)/UMFPACK_QuickStart.pdf -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tony Theodore <tonyt@logyst.com> -Date: Tue, 21 Nov 2017 01:20:21 +1100 -Subject: [PATCH 3/3] add $(TBB) libs to SPQR - +--- a/Makefile 2019-12-22 12:17:36.147324000 +0100 ++++ b/Makefile 2019-12-22 12:23:59.027388353 +0100 +@@ -12,7 +12,6 @@ + # Compile the default rules for each package + go: metis + ( cd SuiteSparse_config && $(MAKE) ) +- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) + ( cd AMD && $(MAKE) ) + ( cd BTF && $(MAKE) ) + ( cd CAMD && $(MAKE) ) +@@ -38,7 +37,6 @@ + # (note that CSparse is not installed; CXSparse is installed instead) + install: metisinstall + ( cd SuiteSparse_config && $(MAKE) install ) +- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install ) + ( cd AMD && $(MAKE) install ) + ( cd BTF && $(MAKE) install ) + ( cd CAMD && $(MAKE) install ) +@@ -85,7 +83,6 @@ + ( cd SuiteSparse_config && $(MAKE) uninstall ) + - ( cd metis-5.1.0 && $(MAKE) uninstall ) + - ( cd GraphBLAS && $(MAKE) uninstall ) +- - ( cd Mongoose && $(MAKE) uninstall ) + ( cd AMD && $(MAKE) uninstall ) + ( cd CAMD && $(MAKE) uninstall ) + ( cd COLAMD && $(MAKE) uninstall ) +@@ -116,7 +113,6 @@ + # the static library + library: metis + ( cd SuiteSparse_config && $(MAKE) ) +- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) + ( cd AMD && $(MAKE) library ) + ( cd BTF && $(MAKE) library ) + ( cd CAMD && $(MAKE) library ) +@@ -143,7 +139,6 @@ + # both the dynamic and static libraries. + static: metis + ( cd SuiteSparse_config && $(MAKE) static ) +- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' static ) + ( cd AMD && $(MAKE) static ) + ( cd BTF && $(MAKE) static ) + ( cd CAMD && $(MAKE) static ) +@@ -171,7 +166,6 @@ + - ( cd metis-5.1.0 && $(MAKE) distclean ) + - ( cd AMD && $(MAKE) purge ) + - ( cd GraphBLAS && $(MAKE) purge ) +- - ( cd Mongoose && $(MAKE) purge ) + - ( cd CAMD && $(MAKE) purge ) + - ( cd COLAMD && $(MAKE) purge ) + - ( cd BTF && $(MAKE) purge ) +@@ -198,7 +192,6 @@ + - ( cd SuiteSparse_config && $(MAKE) clean ) + - ( cd metis-5.1.0 && $(MAKE) clean ) + - ( cd GraphBLAS && $(MAKE) clean ) +- - ( cd Mongoose && $(MAKE) clean ) + - ( cd AMD && $(MAKE) clean ) + - ( cd CAMD && $(MAKE) clean ) + - ( cd COLAMD && $(MAKE) clean ) +@@ -220,7 +213,6 @@ + # Create the PDF documentation + docs: + ( cd GraphBLAS && $(MAKE) docs ) +- ( cd Mongoose && $(MAKE) docs ) + ( cd AMD && $(MAKE) docs ) + ( cd CAMD && $(MAKE) docs ) + ( cd KLU && $(MAKE) docs ) -diff --git a/SPQR/Lib/Makefile b/SPQR/Lib/Makefile -index 1111111..2222222 100644 ---- a/SPQR/Lib/Makefile -+++ b/SPQR/Lib/Makefile -@@ -13,7 +13,7 @@ ccode: all - include ../../SuiteSparse_config/SuiteSparse_config.mk - - # SPQR depends on CHOLMOD, AMD, COLAMD, LAPACK, the BLAS and SuiteSparse_config --LDLIBS += -lamd -lcolamd -lcholmod -lsuitesparseconfig $(LAPACK) $(BLAS) -+LDLIBS += -lamd -lcolamd -lcholmod -lsuitesparseconfig $(LAPACK) $(BLAS) $(TBB) - - # compile and install in SuiteSparse/lib - library: -
--- a/src/suitesparse.mk Tue Dec 17 13:05:13 2019 -0500 +++ b/src/suitesparse.mk Sun Dec 22 13:06:42 2019 +0100 @@ -2,12 +2,11 @@ # See index.html for further information. PKG := suitesparse -$(PKG)_VERSION := 4.5.6 -$(PKG)_CHECKSUM := 06ed5f6f61bfe09f08ce03971a24381a627446b1 -$(PKG)_SUBDIR := SuiteSparse -$(PKG)_FILE := SuiteSparse-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://faculty.cse.tamu.edu/davis/SuiteSparse/$($(PKG)_FILE) -$(PKG)_URL_2 := https://distfiles.macports.org/SuiteSparse/$($(PKG)_FILE) +$(PKG)_VERSION := 5.6.0 +$(PKG)_CHECKSUM := 3de08b5ab02610ed0446225aad2445696616fae5 +$(PKG)_SUBDIR := SuiteSparse-$($(PKG)_VERSION) +$(PKG)_FILE := v$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/$($(PKG)_FILE) $(PKG)_DEPS := blas lapack ifeq ($(USE_SYSTEM_GCC),no) $(PKG)_DEPS += libgomp @@ -49,11 +48,12 @@ RANLIB='$(MXE_RANLIB)' \ BLAS="-lblas -lgfortran" \ LAPACK='-llapack' \ - CHOLMOD_CONFIG='-DNPARTITION' + CHOLMOD_CONFIG='-DNPARTITION' \ + CMAKE_OPTIONS='-DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)"' ifeq ($(MXE_WINDOWS_BUILD),yes) $(PKG)_MAKE_OPTS += \ - UNAME=Windows + UNAME=Windows $(PKG)_SO_DIR := $($(PKG)_DESTDIR)$(HOST_BINDIR) else $(PKG)_SO_DIR := $($(PKG)_DESTDIR)$(HOST_LIBDIR)