From a524b7da1698262db68ce8f50a27406ffd0db036 Mon Sep 17 00:00:00 2001
From: Ian McInerney <i.mcinerney17@imperial.ac.uk>
Date: Thu, 11 Jan 2024 08:57:46 +0000
Subject: [PATCH] [SuiteSparse] Update to 7.5.0

---
 S/SuiteSparse/SuiteSparse@7/build_tarballs.jl | 21 ++++------
 .../bundled/patches/blas_suffix.patch         | 40 -------------------
 S/SuiteSparse/common.jl                       |  4 ++
 3 files changed, 12 insertions(+), 53 deletions(-)
 delete mode 100644 S/SuiteSparse/SuiteSparse@7/bundled/patches/blas_suffix.patch

diff --git a/S/SuiteSparse/SuiteSparse@7/build_tarballs.jl b/S/SuiteSparse/SuiteSparse@7/build_tarballs.jl
index 332a67396b6..16a2f3b0836 100644
--- a/S/SuiteSparse/SuiteSparse@7/build_tarballs.jl
+++ b/S/SuiteSparse/SuiteSparse@7/build_tarballs.jl
@@ -1,13 +1,10 @@
 include("../common.jl")
 
 name = "SuiteSparse"
-version = v"7.4.0"
+version = v"7.5.0"
 
 sources = suitesparse_sources(version)
 
-sources = suitesparse_sources(version)
-push!(sources, DirectorySource("./bundled"))
-
 # Bash recipe for building across all platforms
 script = raw"""
 cd $WORKSPACE/srcdir/SuiteSparse
@@ -15,16 +12,14 @@ cd $WORKSPACE/srcdir/SuiteSparse
 # Needs cmake >= 3.22 provided by jll
 apk del cmake
 
-# Apply upstream patch to fix BLAS calls (backported from 7.5.0 dev branch)
-atomic_patch -p1 ${WORKSPACE}/srcdir/patches/blas_suffix.patch
-
 # Disable OpenMP as it will probably interfere with blas threads and Julia threads
 FLAGS+=(INSTALL="${prefix}" INSTALL_LIB="${libdir}" INSTALL_INCLUDE="${prefix}/include" CFOPENMP=)
 
+BLAS_NAME=blastrampoline
 if [[ "${target}" == *-mingw* ]]; then
-    BLAS_NAME=blastrampoline-5
+    BLAS_LIB=${BLAS_NAME}-5
 else
-    BLAS_NAME=blastrampoline
+    BLAS_LIB=${BLAS_NAME}
 fi
 
 if [[ ${bb_full_target} == *-sanitize+memory* ]]; then
@@ -58,11 +53,11 @@ cmake -DCMAKE_BUILD_TYPE=Release \
       -DSUITESPARSE_USE_OPENMP=OFF \
       -DCHOLMOD_PARTITION=ON \
       -DBLAS_FOUND=1 \
-      -DBLAS_LIBRARIES="${libdir}/lib${BLAS_NAME}.${dlext}" \
-      -DBLAS_LINKER_FLAGS="${BLAS_NAME}" \
+      -DBLAS_LIBRARIES="${libdir}/lib${BLAS_LIB}.${dlext}" \
+      -DBLAS_LINKER_FLAGS="${BLAS_LIB}" \
       -DBLA_VENDOR="${BLAS_NAME}" \
-      -DLAPACK_LIBRARIES="${libdir}/lib${BLAS_NAME}.${dlext}" \
-      -DLAPACK_LINKER_FLAGS="${BLAS_NAME}" \
+      -DLAPACK_LIBRARIES="${libdir}/lib${BLAS_LIB}.${dlext}" \
+      -DLAPACK_LINKER_FLAGS="${BLAS_LIB}" \
       "${CMAKE_OPTIONS[@]}" \
       .
 make -j${nproc}
diff --git a/S/SuiteSparse/SuiteSparse@7/bundled/patches/blas_suffix.patch b/S/SuiteSparse/SuiteSparse@7/bundled/patches/blas_suffix.patch
deleted file mode 100644
index c6a04ddee61..00000000000
--- a/S/SuiteSparse/SuiteSparse@7/bundled/patches/blas_suffix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b936940aab08dc4bc60ccf2b9daec2105a960ad4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de>
-Date: Mon, 1 Jan 2024 13:00:17 +0100
-Subject: [PATCH] Add preprocessor definitions also with user-supplied
- BLAS_LIBRARIES
-
----
- SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake   | 4 ++--
- SuiteSparse_config/cmake_modules/SuiteSparseBLAS64.cmake | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake b/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake
-index ca241472d..be7cd2e73 100644
---- a/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake
-+++ b/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake
-@@ -36,9 +36,9 @@ if ( DEFINED BLAS_LIBRARIES OR DEFINED BLAS_INCLUDE_DIRS )
-     # User supplied variables for libraries and/or include directories.
-     # Use them as-is.
-     if ( SUITESPARSE_USE_64BIT_BLAS )
--        set ( SuiteSparse_BLAS_integer "int64_t" )
-+        include ( SuiteSparseBLAS64 )
-     else ( )
--        set ( SuiteSparse_BLAS_integer "int32_t" )
-+        include ( SuiteSparseBLAS32 )
-     endif ( )
-     return ( )
- endif ( )
-diff --git a/SuiteSparse_config/cmake_modules/SuiteSparseBLAS64.cmake b/SuiteSparse_config/cmake_modules/SuiteSparseBLAS64.cmake
-index 744aaef91..1a5c63690 100644
---- a/SuiteSparse_config/cmake_modules/SuiteSparseBLAS64.cmake
-+++ b/SuiteSparse_config/cmake_modules/SuiteSparseBLAS64.cmake
-@@ -37,7 +37,7 @@ set ( SuiteSparse_BLAS_integer "int64_t" )
- # https://github.com/spack/spack/blob/develop/var/spack/repos/builtin/packages/suite-sparse/package.py
-
- if ( DEFINED BLAS64_SUFFIX )
--    # append BLAS64_SUFFIX to each BLAS and LAPACK name
-+    # append BLAS64_SUFFIX to each BLAS and LAPACK function name
-     string ( FIND ${BLAS64_SUFFIX} "_" HAS_UNDERSCORE )
-     message ( STATUS "BLAS64_suffix: ${BLAS64_SUFFIX}" )
-     if ( HAS_UNDERSCORE EQUAL -1 )
diff --git a/S/SuiteSparse/common.jl b/S/SuiteSparse/common.jl
index 3a1f46dd104..78fe01f321d 100644
--- a/S/SuiteSparse/common.jl
+++ b/S/SuiteSparse/common.jl
@@ -23,6 +23,10 @@ function suitesparse_sources(version::VersionNumber; kwargs...)
         v"7.4.0" => [
             GitSource("https://github.com/DrTimothyAldenDavis/SuiteSparse.git",
                       "df91d7be262e6b5cddf5dd23ff42dec1713e7947")
+        ],
+        v"7.5.0" => [
+            GitSource("https://github.com/DrTimothyAldenDavis/SuiteSparse.git",
+                      "da5050cd3f6b6a15ec4d7c42b2c1e2dfe4f8ef6e")
         ]
     )
     return Any[