Skip to content

Commit 51c4ff3

Browse files
fxcoudertViralBShah
fxcoudert
authored and
ViralBShah
committed
[SuiteSparse_jll] Update to v7.0.1
Update checksums
1 parent dc3953d commit 51c4ff3

File tree

8 files changed

+87
-106
lines changed

8 files changed

+87
-106
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ else ifeq ($(JULIA_BUILD_MODE),debug)
193193
JL_PRIVATE_LIBS-0 += libjulia-internal-debug libjulia-codegen-debug
194194
endif
195195
ifeq ($(USE_GPL_LIBS), 1)
196-
JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBSUITESPARSE) += libamd libbtf libcamd libccolamd libcholmod libcolamd libklu libldl librbio libspqr libsuitesparseconfig libumfpack
196+
JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBSUITESPARSE) += libamd libbtf libcamd libccolamd libcholmod libcholmod_cuda libcolamd libklu libldl librbio libspqr libspqr_cuda libsuitesparseconfig libumfpack
197197
endif
198198
JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBBLASTRAMPOLINE) += libblastrampoline
199199
JL_PRIVATE_LIBS-$(USE_SYSTEM_PCRE) += libpcre2-8

‎base/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,11 @@ $(eval $(call symlink_system_library,LIBSUITESPARSE,libamd))
265265
$(eval $(call symlink_system_library,LIBSUITESPARSE,libcamd))
266266
$(eval $(call symlink_system_library,LIBSUITESPARSE,libccolamd))
267267
$(eval $(call symlink_system_library,LIBSUITESPARSE,libcholmod))
268+
$(eval $(call symlink_system_library,LIBSUITESPARSE,libcholmod_cuda))
268269
$(eval $(call symlink_system_library,LIBSUITESPARSE,libcolamd))
269270
$(eval $(call symlink_system_library,LIBSUITESPARSE,libumfpack))
270271
$(eval $(call symlink_system_library,LIBSUITESPARSE,libspqr))
272+
$(eval $(call symlink_system_library,LIBSUITESPARSE,libspqr_cuda))
271273
$(eval $(call symlink_system_library,LIBSUITESPARSE,libsuitesparseconfig))
272274
# EXCLUDED LIBRARIES (installed/used, but not vendored for use with dlopen):
273275
# libunwind

‎deps/checksums/suitesparse‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
SuiteSparse-5.10.1.tar.gz/md5/68bb912f3cf3d2b01f30ebafef690302
2-
SuiteSparse-5.10.1.tar.gz/sha512/8f85c6d63b76cba95707dfa732c51200df7794cb4c2599dbd92100475747b8d02b05089a47096e85c60b89bc852a8e768e0670f24902a82d29494a80ccf2bb5f
1+
SuiteSparse-7.0.1.tar.gz/md5/d31bbe2a26dced338b23e71f7c9b541a
2+
SuiteSparse-7.0.1.tar.gz/sha512/af311efec01849d2c4445e163035a7013f3334a90edcda40f5dab0b35ad5d9a3e643c716c08a131ae99195bec016d1363623570058b05f3ee2a9ed4c483016db
33
SuiteSparse-e8285dd13a6d5b5cf52d8124793fc4d622d07554.tar.gz/md5/46541001073d1c3c85e18d910f8308f3
44
SuiteSparse-e8285dd13a6d5b5cf52d8124793fc4d622d07554.tar.gz/sha512/f7470a447b934ca9315e216a07b97e363f11bc93186f9aa057b20b2d05092c58ae4f1b733de362de4a0730861c00be4ca5588d0b3ba65f018c1798b9122b9672
5-
SuiteSparse.v5.10.1+6.aarch64-apple-darwin.tar.gz/md5/14cc0d3c7b5271246eb45c495c7a4e79
6-
SuiteSparse.v5.10.1+6.aarch64-apple-darwin.tar.gz/sha512/a56da81a5165bcdf49d1913799bffcaea84efd6f8740dd002f700eb4070313cac64be5359ba88d1f39fe976944e34ee6ed6575ceade2ae2d97b850e6a1aee0ae
7-
SuiteSparse.v5.10.1+6.aarch64-linux-gnu.tar.gz/md5/b93b047040e2db5e0277e52b9bd3feb7
8-
SuiteSparse.v5.10.1+6.aarch64-linux-gnu.tar.gz/sha512/e03a9ecafce9dcc6791dd202efac2f864bdf3a0a4524567801c092304c17ab15dae949abfb1fe2bc71b367a0e398260ccfdd91dad611860090df471b44e75ee3
9-
SuiteSparse.v5.10.1+6.aarch64-linux-musl.tar.gz/md5/22c44d9d82608724e1aa62d126fdf030
10-
SuiteSparse.v5.10.1+6.aarch64-linux-musl.tar.gz/sha512/39a3c11429cd3e6afa2f615dc4b0c8d16d7b94a423d76e598b3b48db2c47fe64d644233e2a672bd6654f8bd57da91dd7a787a3e4978f0f803237ab4ec6f97905
11-
SuiteSparse.v5.10.1+6.armv6l-linux-gnueabihf.tar.gz/md5/505ee3c0750a720ed1e4de670f81e220
12-
SuiteSparse.v5.10.1+6.armv6l-linux-gnueabihf.tar.gz/sha512/20fafbdd2df96427b95b730901663c255dafc415f3a8154e3364ec46ca2b205fa45a081f92272b81d7aed22b9f8373d2d4eee70ff8ab5ed8d1d80b6a340c8aad
13-
SuiteSparse.v5.10.1+6.armv6l-linux-musleabihf.tar.gz/md5/8e1821668cbca9c2d3c5cee5ad1746c8
14-
SuiteSparse.v5.10.1+6.armv6l-linux-musleabihf.tar.gz/sha512/58fb4ec10a537d101e0be8417648a4d0127444b3fe8a32498320aaaefc747f5cac3c7503b70775c1d708b077034060fe5ed8609e73bf9be22f9a8729abc4c73d
15-
SuiteSparse.v5.10.1+6.armv7l-linux-gnueabihf.tar.gz/md5/43d133a916e548ecae50671b92f64c6f
16-
SuiteSparse.v5.10.1+6.armv7l-linux-gnueabihf.tar.gz/sha512/f7f767c0e7eb45afe10941513695bfcc9e0628195cb9245a9c24700967f9cfa7cd0030cdcfaf47a76400d5dd3eb908c1f9ea5e44efd3054ed7bba47e664279a2
17-
SuiteSparse.v5.10.1+6.armv7l-linux-musleabihf.tar.gz/md5/7c3b2e19d3296002b1aa72b951421eec
18-
SuiteSparse.v5.10.1+6.armv7l-linux-musleabihf.tar.gz/sha512/7546ce844b03d0414168ab6d0925f848b14b35ed27cb545b41f2512bad44b7da4f39004e75657c7c572557ccb015177d3e0d346e2c3182b27a6ee602876ee0df
19-
SuiteSparse.v5.10.1+6.i686-linux-gnu.tar.gz/md5/e00a73f0fad92a266dd8d3774707f9b1
20-
SuiteSparse.v5.10.1+6.i686-linux-gnu.tar.gz/sha512/9cc2332a78d0490170d722d2f062d6f660fb3bd9042dd177c3683675d0f44306b93bf882cb79c0707ab79318280d08582431eb1c92334f2bb50946e942be0b16
21-
SuiteSparse.v5.10.1+6.i686-linux-musl.tar.gz/md5/71fb647a76ecc9e547df903535011b5b
22-
SuiteSparse.v5.10.1+6.i686-linux-musl.tar.gz/sha512/7806cd9179e46fa61b63a3f711b37289da72a48430912e564c88e3dcb4caaad8a9bd232d6f572f8270806d286e4a4eb9edfdcda29fe8d91dadb1b03d57eda76d
23-
SuiteSparse.v5.10.1+6.i686-w64-mingw32.tar.gz/md5/d4e6c9aba53b2107469cda6de9ca2724
24-
SuiteSparse.v5.10.1+6.i686-w64-mingw32.tar.gz/sha512/c0c49641c6e7f3f0333e3fa44ce62dcd4ad5942c74b2429aaeb49fd0d7b8c13c872150ae4d54cc5cfaae07a65a24a7d4ea731adc78db3d9341a54e5edb5c80f0
25-
SuiteSparse.v5.10.1+6.powerpc64le-linux-gnu.tar.gz/md5/5432dca00f7e0f42b7dbd16083537318
26-
SuiteSparse.v5.10.1+6.powerpc64le-linux-gnu.tar.gz/sha512/61946a7faa2a49613ea2c08a01f064b619c9ec134f0d9509eb42a96bebf2a63f5fb57b14702f25618def410658da8334bb6aa5200280956e573aa944476efef2
27-
SuiteSparse.v5.10.1+6.x86_64-apple-darwin.tar.gz/md5/ca175d433a02f91407e2921872c2b67c
28-
SuiteSparse.v5.10.1+6.x86_64-apple-darwin.tar.gz/sha512/14d9b01e2db8c04f9a1076bcbac022c6573728f708f31344825805fed53971e922aecebeb4b2f567a6b5f44ad27c0d66e142887ff4684c8679ab65b902538abf
29-
SuiteSparse.v5.10.1+6.x86_64-linux-gnu.tar.gz/md5/6c271ced91dbb1bf748efbaace1dac10
30-
SuiteSparse.v5.10.1+6.x86_64-linux-gnu.tar.gz/sha512/5984db9c101ef80d63024bc3b51821268349450deedd5aaea5fade0fc5932992379a0133c4f91711af134014835afea1bde518ae1e7efd482d556a97e54b0238
31-
SuiteSparse.v5.10.1+6.x86_64-linux-musl.tar.gz/md5/c7d55069969dbb98997687c847ab643d
32-
SuiteSparse.v5.10.1+6.x86_64-linux-musl.tar.gz/sha512/b54012765f7c7329125b41c3fb678e23888a858d3fd5a139c52bd980e383a308282238020754e795de6457fb312b61c39e6ab2d665ca5af95c65f52f0c354067
33-
SuiteSparse.v5.10.1+6.x86_64-unknown-freebsd.tar.gz/md5/e641be38c8205e362a7299c736aedad5
34-
SuiteSparse.v5.10.1+6.x86_64-unknown-freebsd.tar.gz/sha512/d55e85335bccb59210014c35233ad9e42f5d086f01a43fe0ee13f21cbb8555ea05f1d91c95a6d3f883477086851e123c4b0cde7cd2dcd8e08835fe9f685d5b25
35-
SuiteSparse.v5.10.1+6.x86_64-w64-mingw32.tar.gz/md5/45cad947fa962e1f192cb7b52a1f7b3c
36-
SuiteSparse.v5.10.1+6.x86_64-w64-mingw32.tar.gz/sha512/e6545c681ba7d2346baf8fafabdf25f2faf6ea54763d999b14499f30d235e90f34fd4f83430ea7f17c01adea0699dff6c4d7ae3cb938c749d6a15f8bf4f1519f
5+
SuiteSparse.v7.0.1+0.aarch64-apple-darwin.tar.gz/md5/a46b2ba38b460d259021f254f211b536
6+
SuiteSparse.v7.0.1+0.aarch64-apple-darwin.tar.gz/sha512/509cc94e99e799dfea53a2f0773e70274bc2d0611691289f2ac5c879a8ec52a2c7edaae3b3d8a19afb54f50d57a63adaa48b4ec40eb44f416e14d7129a74a1a3
7+
SuiteSparse.v7.0.1+0.aarch64-linux-gnu.tar.gz/md5/37eecb206e8fb30cfbda772460327609
8+
SuiteSparse.v7.0.1+0.aarch64-linux-gnu.tar.gz/sha512/ca9dba3afd9ab51d94d305fcf28a55fa741883d865b50237ddd83d197a0e4c42b0d2d12a0e8a71700553a9843270190d547da19e1424009ebc9eb81c54e36cf7
9+
SuiteSparse.v7.0.1+0.aarch64-linux-musl.tar.gz/md5/b57d52cebd6653d2eb5532b742bea455
10+
SuiteSparse.v7.0.1+0.aarch64-linux-musl.tar.gz/sha512/71133c32ff143ed9ddf821f5911650cfd9f036ab573043acdd002fcfc545433bc3bad9d47309d09e8a163015fdcba09e1aea7700b23194548e8cec4fc7488703
11+
SuiteSparse.v7.0.1+0.armv6l-linux-gnueabihf.tar.gz/md5/063bb5fa15abe461c3c0712f45969fab
12+
SuiteSparse.v7.0.1+0.armv6l-linux-gnueabihf.tar.gz/sha512/72d9e8443461283fd04994e91c6a04e7fb39bce399025a16748c20efc3320369e890b021d0733c4070271ba9f8e2b7611560885aa523c13aa579589e7ec1614d
13+
SuiteSparse.v7.0.1+0.armv6l-linux-musleabihf.tar.gz/md5/d7621f8f7e79c30026896b229334fde6
14+
SuiteSparse.v7.0.1+0.armv6l-linux-musleabihf.tar.gz/sha512/12bce1f5f39f17461b21b4afabf7d9aad7c2cd570c329a75b5e99cd5a300802a4aae3ae1100a0fe8616bd12a8fedeb154967616ad67c7aaedf302b7396b2fa49
15+
SuiteSparse.v7.0.1+0.armv7l-linux-gnueabihf.tar.gz/md5/16b20618a9443d222ca1dbcaee328fe7
16+
SuiteSparse.v7.0.1+0.armv7l-linux-gnueabihf.tar.gz/sha512/67924af6577fdb0704e03754f96e7d0bafd4cca37d0436cf996fab5ac43de606386ae3ea0a9979585fc1e2e950648768992d3ff555fdd93d380bd5578fd4e93e
17+
SuiteSparse.v7.0.1+0.armv7l-linux-musleabihf.tar.gz/md5/1f496d19cb82623456e22b22922fc69d
18+
SuiteSparse.v7.0.1+0.armv7l-linux-musleabihf.tar.gz/sha512/18b63deea2b3d0863d634f5de5d9ce529eed5c9ce07164d070da6d65c7a9a54fff69596e379f851fee1f57b8fdb9796e5afa812c117207120c7ef612c2bebe40
19+
SuiteSparse.v7.0.1+0.i686-linux-gnu.tar.gz/md5/0b7ff6e7be4985f73a7c86fe46de397e
20+
SuiteSparse.v7.0.1+0.i686-linux-gnu.tar.gz/sha512/85242ce2163e5c838ccb8f4463bdb3bd5ace5b20e72916513d80b769c085ea2f178d6ec6e4c89208f6a5135515340c61fdf3f98de8b109b1db51fb93d821b536
21+
SuiteSparse.v7.0.1+0.i686-linux-musl.tar.gz/md5/09de2bb8f368952044ce99b23da2c175
22+
SuiteSparse.v7.0.1+0.i686-linux-musl.tar.gz/sha512/76c2b7f35e16bc525df1e7e26a216461f4f6f7a48caa3d2bca1daf64b26058b5b8ca09dcc996e1dd9c631ec08c3a85e09c67c69bd47de29fd0facd84fcde31df
23+
SuiteSparse.v7.0.1+0.i686-w64-mingw32.tar.gz/md5/20e53a1777edcaab38cc2572de5b3a55
24+
SuiteSparse.v7.0.1+0.i686-w64-mingw32.tar.gz/sha512/9df0be5001aa05de08ada9500c1635deeb92f217b075c37d2e4c900acb1e75a98a49b76ab79cb8d7fb6c97cf74e5b67762e42b9b475b03c0e8bd7a4e74ef19d1
25+
SuiteSparse.v7.0.1+0.powerpc64le-linux-gnu.tar.gz/md5/934cd7c0db8ddefd02564830cfa2e059
26+
SuiteSparse.v7.0.1+0.powerpc64le-linux-gnu.tar.gz/sha512/a3c0748462c311b24e1de3c2ec5f7358c7694a2e30ce67ef58b7491f519d486aa64bffde1a88b77c347a44a7c89f5caeb73c16017951f5dfb25ac57b23482963
27+
SuiteSparse.v7.0.1+0.x86_64-apple-darwin.tar.gz/md5/bffa77fd8d37e6aad3e855f4edd79bdb
28+
SuiteSparse.v7.0.1+0.x86_64-apple-darwin.tar.gz/sha512/54bee75edccac7934df68fbab2d35db755f80b32508c94c6fe1d93f9d4f9cf1f723fb034c5e1ca500f64be8b3911921a6fc57b9f84322a26ef51067e5d5be26c
29+
SuiteSparse.v7.0.1+0.x86_64-linux-gnu.tar.gz/md5/9bf03ef3e69c7460008f5f2c0dbaa9d6
30+
SuiteSparse.v7.0.1+0.x86_64-linux-gnu.tar.gz/sha512/5d581dcff9e885d2848e60d09ebf0072222ab91d188532d205d3a45b3be0a179ee40ba6b40192d52528100e1afde656e05db404fac6fb4a65d42a71f646ca395
31+
SuiteSparse.v7.0.1+0.x86_64-linux-musl.tar.gz/md5/3cd348922eeb73fa8f9958341628f7a6
32+
SuiteSparse.v7.0.1+0.x86_64-linux-musl.tar.gz/sha512/493f4fc4c0813a8e5b2fbc2f1711664807245c66e68b3880d9c95e0f20bba93f5d912531a4adf1900225ae8fe65a5ff1bb6842c235e772162ddf4eb9e78fcbf6
33+
SuiteSparse.v7.0.1+0.x86_64-unknown-freebsd.tar.gz/md5/1b8e67dffe3a7dd01575e763be0698aa
34+
SuiteSparse.v7.0.1+0.x86_64-unknown-freebsd.tar.gz/sha512/b04436019f92edf334d0116afd5808a3f146bf35aa11293ae509e0de06c1192ed8100fd0366e1ffb24d1950cc0cce05b87f8244bb8da100f465ed4d4282e3e00
35+
SuiteSparse.v7.0.1+0.x86_64-w64-mingw32.tar.gz/md5/29f0e6c518fa97e4c5c9129a469fb0ab
36+
SuiteSparse.v7.0.1+0.x86_64-w64-mingw32.tar.gz/sha512/e0e74a8614f9b7df09e6d8c6e522d9f46952974924d69d60bb08842e94752b5fbcf884a486eec8fa13e1e1afe73019c1d61f92432d147b2adcebf55210b477ef

‎deps/libsuitesparse.mk‎

Lines changed: 23 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,27 @@
11
## LIBSUITESPARSE ##
22
include $(SRCDIR)/libsuitesparse.version
33

4-
ifeq ($(USE_BLAS64), 1)
5-
UMFPACK_CONFIG := -DLONGBLAS='long long'
6-
CHOLMOD_CONFIG := -DLONGBLAS='long long'
7-
SPQR_CONFIG := -DLONGBLAS='long long'
8-
UMFPACK_CONFIG += -DSUN64
9-
CHOLMOD_CONFIG += -DSUN64
10-
SPQR_CONFIG += -DSUN64
11-
endif
12-
13-
# Disable linking to libmetis
14-
CHOLMOD_CONFIG += -DNPARTITION
15-
164
ifneq ($(USE_BINARYBUILDER_LIBSUITESPARSE), 1)
175

186
LIBSUITESPARSE_PROJECTS := AMD BTF CAMD CCOLAMD COLAMD CHOLMOD LDL KLU UMFPACK RBio SPQR
197
LIBSUITESPARSE_LIBS := $(addsuffix .*$(SHLIB_EXT)*,suitesparseconfig amd btf camd ccolamd colamd cholmod klu ldl umfpack rbio spqr)
208

21-
SUITESPARSE_LIB := $(LDFLAGS) -L"$(abspath $(BUILDDIR))/SuiteSparse-$(LIBSUITESPARSE_VER)/lib"
22-
ifeq ($(OS), Darwin)
23-
SUITESPARSE_LIB += $(RPATH_ESCAPED_ORIGIN)
24-
endif
25-
LIBSUITESPARSE_MFLAGS := CC="$(CC) $(SANITIZE_OPTS)" CXX="$(CXX) $(SANITIZE_OPTS)" F77="$(FC)" \
26-
AR="$(AR)" RANLIB="$(RANLIB)" \
27-
BLAS="-L$(build_shlibdir) -lblastrampoline" \
28-
LAPACK="-L$(build_shlibdir) -lblastrampoline" \
29-
LDFLAGS="$(SUITESPARSE_LIB) $(SANITIZE_LDFLAGS)" CFOPENMP="" CUDA=no CUDA_PATH="" \
30-
UMFPACK_CONFIG="$(UMFPACK_CONFIG)" \
31-
CHOLMOD_CONFIG="$(CHOLMOD_CONFIG)" \
32-
SPQR_CONFIG="$(SPQR_CONFIG)"
33-
ifeq ($(OS),WINNT)
34-
LIBSUITESPARSE_MFLAGS += UNAME=Windows
35-
else
36-
LIBSUITESPARSE_MFLAGS += UNAME=$(OS)
37-
endif
9+
LIBSUITESPARSE_CMAKE_FLAGS := $(CMAKE_COMMON) \
10+
-DCMAKE_BUILD_TYPE=Release \
11+
-DENABLE_CUDA=NO \
12+
-DNFORTRAN=YES \
13+
-DNOPENMP=YES \
14+
-DNPARTITION=YES \
15+
-DBLAS_FOUND=1 \
16+
-DBLAS_LIBRARIES="$(build_shlibdir)/libblastrampoline.$(SHLIB_EXT)" \
17+
-DBLAS_LINKER_FLAGS="blastrampoline" \
18+
-DBLAS_UNDERSCORE=ON \
19+
-DBLA_VENDOR="blastrampoline" \
20+
-DBLAS64_SUFFIX="_64" \
21+
-DALLOW_64BIT_BLAS=ON \
22+
-DLAPACK_FOUND=1 \
23+
-DLAPACK_LIBRARIES="$(build_shlibdir)/libblastrampoline.$(SHLIB_EXT)" \
24+
-DLAPACK_LINKER_FLAGS="blastrampoline"
3825

3926
$(SRCCACHE)/SuiteSparse-$(LIBSUITESPARSE_VER).tar.gz: | $(SRCCACHE)
4027
$(JLDOWNLOAD) $@ https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v$(LIBSUITESPARSE_VER).tar.gz
@@ -48,19 +35,16 @@ $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/source-extracted: $(SRCCACHE)/Suit
4835
checksum-libsuitesparse: $(SRCCACHE)/SuiteSparse-$(LIBSUITESPARSE_VER).tar.gz
4936
$(JLCHECKSUM) $<
5037

51-
$(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/SuiteSparse-shlib.patch-applied: $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/source-extracted
52-
cd $(dir $@) && patch -p1 < $(SRCDIR)/patches/SuiteSparse-shlib.patch
53-
echo 1 > $@
54-
$(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-compiled: $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/SuiteSparse-shlib.patch-applied
55-
5638
$(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-compiled: | $(build_prefix)/manifest/blastrampoline
5739

5840
$(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-compiled: $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/source-extracted
59-
$(MAKE) -C $(dir $<)SuiteSparse_config library config $(LIBSUITESPARSE_MFLAGS)
60-
$(INSTALL_NAME_CMD)libsuitesparseconfig.$(SHLIB_EXT) $(dir $<)lib/libsuitesparseconfig.$(SHLIB_EXT)
61-
for PROJ in $(LIBSUITESPARSE_PROJECTS); do \
62-
$(MAKE) -C $(dir $<)$${PROJ} library $(LIBSUITESPARSE_MFLAGS) || exit 1; \
63-
$(INSTALL_NAME_CMD)lib`echo $${PROJ} | tr A-Z a-z`.$(SHLIB_EXT) $(dir $<)lib/lib`echo $${PROJ} | tr A-Z a-z`.$(SHLIB_EXT) || exit 1; \
41+
cd $(dir $<); \
42+
for PROJ in SuiteSparse_config $(LIBSUITESPARSE_PROJECTS); do \
43+
cd $${PROJ}/build || exit 1; \
44+
$(CMAKE) .. $(LIBSUITESPARSE_CMAKE_FLAGS) || exit 1; \
45+
make || exit 1; \
46+
make install || exit 1; \
47+
cd ../..; \
6448
done
6549
echo 1 > $@
6650

@@ -78,11 +62,6 @@ $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-checked: $(BUILDDIR)/SuiteSp
7862
UNINSTALL_suitesparse := $(LIBSUITESPARSE_VER) manual_suitesparse $(LIBSUITESPARSE_LIBS)
7963

8064
$(build_prefix)/manifest/libsuitesparse: $(BUILDDIR)/SuiteSparse-$(LIBSUITESPARSE_VER)/build-compiled | $(build_prefix)/manifest $(build_shlibdir)
81-
for lib in $(LIBSUITESPARSE_LIBS); do \
82-
cp -a $(dir $<)lib/lib$${lib} $(build_shlibdir) || exit 1; \
83-
done
84-
#cp -a $(dir $<)lib/* $(build_shlibdir)
85-
#cp -a $(dir $<)include/* $(build_includedir)
8665
echo $(UNINSTALL_libsuitesparse) > $@
8766

8867
clean-libsuitesparse: uninstall-libsuitesparse

‎deps/libsuitesparse.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
LIBSUITESPARSE_JLL_NAME := SuiteSparse
33

44
## source build
5-
LIBSUITESPARSE_VER := 5.10.1
5+
LIBSUITESPARSE_VER := 7.0.1

‎stdlib/SuiteSparse_jll/Project.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "SuiteSparse_jll"
22
uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c"
3-
version = "5.10.1+6"
3+
version = "7.0.1+0"
44

55
[deps]
66
libblastrampoline_jll = "8e850b90-86db-534c-a0d3-1478176c7d93"

‎stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -54,31 +54,31 @@ if Sys.iswindows()
5454
const libsuitesparseconfig = "libsuitesparseconfig.dll"
5555
const libumfpack = "libumfpack.dll"
5656
elseif Sys.isapple()
57-
const libamd = "@rpath/libamd.2.dylib"
58-
const libbtf = "@rpath/libbtf.1.dylib"
59-
const libcamd = "@rpath/libcamd.2.dylib"
60-
const libccolamd = "@rpath/libccolamd.2.dylib"
61-
const libcholmod = "@rpath/libcholmod.3.dylib"
62-
const libcolamd = "@rpath/libcolamd.2.dylib"
63-
const libklu = "@rpath/libklu.1.dylib"
64-
const libldl = "@rpath/libldl.2.dylib"
65-
const librbio = "@rpath/librbio.2.dylib"
66-
const libspqr = "@rpath/libspqr.2.dylib"
67-
const libsuitesparseconfig = "@rpath/libsuitesparseconfig.5.dylib"
68-
const libumfpack = "@rpath/libumfpack.5.dylib"
57+
const libamd = "@rpath/libamd.3.dylib"
58+
const libbtf = "@rpath/libbtf.2.dylib"
59+
const libcamd = "@rpath/libcamd.3.dylib"
60+
const libccolamd = "@rpath/libccolamd.3.dylib"
61+
const libcholmod = "@rpath/libcholmod.4.dylib"
62+
const libcolamd = "@rpath/libcolamd.3.dylib"
63+
const libklu = "@rpath/libklu.2.dylib"
64+
const libldl = "@rpath/libldl.3.dylib"
65+
const librbio = "@rpath/librbio.3.dylib"
66+
const libspqr = "@rpath/libspqr.3.dylib"
67+
const libsuitesparseconfig = "@rpath/libsuitesparseconfig.7.dylib"
68+
const libumfpack = "@rpath/libumfpack.6.dylib"
6969
else
70-
const libamd = "libamd.so.2"
71-
const libbtf = "libbtf.so.1"
72-
const libcamd = "libcamd.so.2"
73-
const libccolamd = "libccolamd.so.2"
74-
const libcholmod = "libcholmod.so.3"
75-
const libcolamd = "libcolamd.so.2"
76-
const libklu = "libklu.so.1"
77-
const libldl = "libldl.so.2"
78-
const librbio = "librbio.so.2"
79-
const libspqr = "libspqr.so.2"
80-
const libsuitesparseconfig = "libsuitesparseconfig.so.5"
81-
const libumfpack = "libumfpack.so.5"
70+
const libamd = "libamd.so.3"
71+
const libbtf = "libbtf.so.2"
72+
const libcamd = "libcamd.so.3"
73+
const libccolamd = "libccolamd.so.3"
74+
const libcholmod = "libcholmod.so.4"
75+
const libcolamd = "libcolamd.so.3"
76+
const libklu = "libklu.so.2"
77+
const libldl = "libldl.so.3"
78+
const librbio = "librbio.so.3"
79+
const libspqr = "libspqr.so.3"
80+
const libsuitesparseconfig = "libsuitesparseconfig.so.7"
81+
const libumfpack = "libumfpack.so.6"
8282
end
8383

8484
function __init__()

‎stdlib/SuiteSparse_jll/test/runtests.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
using Test, SuiteSparse_jll
44

55
@testset "SuiteSparse_jll" begin
6-
@test ccall((:SuiteSparse_version, libsuitesparseconfig), Cint, (Ptr{Cint},), C_NULL) == 5010
6+
@test ccall((:SuiteSparse_version, libsuitesparseconfig), Cint, (Ptr{Cint},), C_NULL) == 7001
77
end

0 commit comments

Comments
 (0)