Upgrade to upstream version 6.0.2

4 files changed, 42 insertions, 89 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a6b89160a87d..42f0521a78d4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Sep 27 07:32:56 UTC 2022
+# Fri Dec 23 20:54:03 UTC 2022
 pkgbase = lib32-suitesparse
 	pkgdesc = A collection of sparse matrix libraries (32-bit)
-	pkgver = 5.13.0
+	pkgver = 6.0.2
 	pkgrel = 1
 	url = http://faculty.cse.tamu.edu/davis/suitesparse.html
 	arch = x86_64
@@ -16,12 +16,10 @@ pkgbase = lib32-suitesparse
 	depends = suitesparse
 	depends = lib32-mpfr
 	options = staticlibs
-	source = suitesparse-5.13.0.tar.gz::https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.13.0.tar.gz
-	source = suitesparse-no-demo.patch
+	source = suitesparse-6.0.2.tar.gz::https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v6.0.2.tar.gz
 	source = flags.patch
-	sha512sums = d053dd3d2f2b670fb32cc90712cff7c4ca0a8b6f99be87f921c07be49a3f8a9904575497ae1d396f0d97895f03a442094582264d59f51c5f2708fddb57adef6c
-	sha512sums = 2a946d5436a6e2f9d66438edefb083c73ebb049e987a2279dfe6b3bb61969c908333a9b0164739d292be3938d02cc905e7e5d3c7699effd7004f0dfb108c9f71
-	sha512sums = ddeaf56911e84c0458c5723ed3eceadbf224c2b8fa8438078a7bf09a4cb9a96299f8ff3984b99f9d087366705fa821cd5b98b73faf791c547419aa951af4facb
+	sha512sums = 1a688bd07176e32649f316ab47b2876ed53c725520df9d36a0181ecfe28ed9724d32a0ea853545ced0b7969660c88802dfb950f7624901f2cbcd0a23802d26c1
+	sha512sums = 8cf71d9186a2a221527bccef9cfa3b990476d8aeb9d721e810ce96e371aa982536f2ab0a30977db5e2b133c9636397de1913b99850a7fa8941d5119814cc9d65
 
 pkgname = lib32-suitesparse
 
diff --git a/PKGBUILD b/PKGBUILD
index 49891601fc89..b9f74ed3cd95 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=lib32-suitesparse
 _pkgbase=suitesparse
-pkgver=5.13.0
+pkgver=6.0.2
 pkgrel=1
 pkgdesc="A collection of sparse matrix libraries (32-bit)"
 url="http://faculty.cse.tamu.edu/davis/suitesparse.html"
@@ -14,15 +14,12 @@ makedepends=('gcc-fortran-multilib' 'cmake' 'chrpath')
 license=('GPL')
 options=('staticlibs')
 source=($_pkgbase-$pkgver.tar.gz::"https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v$pkgver.tar.gz"
-        "suitesparse-no-demo.patch"
         "flags.patch")
-sha512sums=('d053dd3d2f2b670fb32cc90712cff7c4ca0a8b6f99be87f921c07be49a3f8a9904575497ae1d396f0d97895f03a442094582264d59f51c5f2708fddb57adef6c'
-            '2a946d5436a6e2f9d66438edefb083c73ebb049e987a2279dfe6b3bb61969c908333a9b0164739d292be3938d02cc905e7e5d3c7699effd7004f0dfb108c9f71'
-            'ddeaf56911e84c0458c5723ed3eceadbf224c2b8fa8438078a7bf09a4cb9a96299f8ff3984b99f9d087366705fa821cd5b98b73faf791c547419aa951af4facb')
+sha512sums=('1a688bd07176e32649f316ab47b2876ed53c725520df9d36a0181ecfe28ed9724d32a0ea853545ced0b7969660c88802dfb950f7624901f2cbcd0a23802d26c1'
+            '8cf71d9186a2a221527bccef9cfa3b990476d8aeb9d721e810ce96e371aa982536f2ab0a30977db5e2b133c9636397de1913b99850a7fa8941d5119814cc9d65')
 
 prepare() {
   cd "${srcdir}/SuiteSparse-$pkgver"
-  patch -p1 -i ../suitesparse-no-demo.patch
   patch -p1 -i ../flags.patch
 }
 
@@ -30,6 +27,15 @@ build() {
   cd "${srcdir}/SuiteSparse-$pkgver"
   export CC="gcc -m32" CXX="g++ -m32" PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
   export BLAS=-lblas LAPACK=-llapack TBB=-ltbb SPQR_CONFIG=-DHAVE_TBB MY_METIS_LIB=/usr/lib32/libmetis.so
+  CXXFLAGS+=" -m32 -ffat-lto-objects" \
+  CMAKE_OPTIONS="-DENABLE_CUDA=0 \
+  -DBLAS_LIBRARIES=/usr/lib32/libblas.so \
+  -DLAPACK_LIBRARIES=/usr/lib32/liblapack.so \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_INSTALL_LIBDIR=lib32 \
+  -DBLA_VENDOR=Generic \
+  -DCMAKE_BUILD_TYPE=None \
+  -DCMAKE_CXX_FLAGS_DEBUG=-m32 -DCMAKE_EXE_LINKER_FLAGS_DEBUG=-m32 -DCMAKE_Fortran_FLAGS=-m32" \
   make
 }
 
@@ -38,9 +44,9 @@ package() {
 
   export CC="gcc -m32" CXX="g++ -m32" PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
   export BLAS=-lblas LAPACK=-llapack TBB=-ltbb SPQR_CONFIG=-DHAVE_TBB MY_METIS_LIB=/usr/lib32/libmetis.so
-  make INSTALL_LIB="${pkgdir}/usr/lib32" INSTALL_INCLUDE="${pkgdir}/usr/include" install
+  DESTDIR="$pkgdir" make install
 
-  rm -r "${pkgdir}"/usr/include
-  chrpath -d "$pkgdir"/usr/lib32/*
+  rm -rf "${pkgdir}"/usr/{bin,include}
+  chrpath -d "$pkgdir"/usr/lib32/*.so
 }
 
diff --git a/flags.patch b/flags.patch
index 301e5e65fad9..1539b91fb8dd 100644
--- a/flags.patch
+++ b/flags.patch
@@ -1,35 +1,29 @@
-diff -ruN SuiteSparse-5.10.1.orig/Mongoose/CMakeLists.txt SuiteSparse-5.10.1/Mongoose/CMakeLists.txt
---- SuiteSparse-5.10.1.orig/Mongoose/CMakeLists.txt	2021-05-18 17:31:16.000000000 +0430
-+++ SuiteSparse-5.10.1/Mongoose/CMakeLists.txt	2021-10-15 13:18:15.322991534 +0330
-@@ -328,7 +328,7 @@
+diff -ruN SuiteSparse-6.0.2.orig/Mongoose/CMakeLists.txt SuiteSparse-6.0.2/Mongoose/CMakeLists.txt
+--- SuiteSparse-6.0.2.orig/Mongoose/CMakeLists.txt	2022-12-12 06:02:33.000000000 +0330
++++ SuiteSparse-6.0.2/Mongoose/CMakeLists.txt	2022-12-23 21:49:55.460818342 +0330
+@@ -308,14 +308,14 @@
+ message(STATUS "CMAKE_CXX_COMPILER: " ${BoldBlue} ${CMAKE_CXX_COMPILER_ID} ${ColourReset})
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
+     # using Clang
+-    SET(CMAKE_CXX_FLAGS "-O3 -fwrapv")
++    SET(CMAKE_CXX_FLAGS "-m32 -O3 -fwrapv")
+     # Debug flags for Clang
+     SET(CMAKE_CXX_FLAGS_DEBUG "--coverage -g -fwrapv")
+     SET(CMAKE_C_FLAGS_DEBUG "--coverage -g")
      SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "--coverage -g")
  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
      # using GCC
 -    SET(CMAKE_CXX_FLAGS "-O3 -fwrapv")
 +    SET(CMAKE_CXX_FLAGS "-m32 -O3 -fwrapv")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-variable -Wno-unused-variable" )
      # Debug flags for GCC
      if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.6")
-         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-diff -ruN SuiteSparse-5.10.1.orig/SuiteSparse_config/SuiteSparse_config.mk SuiteSparse-5.10.1/SuiteSparse_config/SuiteSparse_config.mk
---- SuiteSparse-5.10.1.orig/SuiteSparse_config/SuiteSparse_config.mk	2021-05-18 17:31:16.000000000 +0430
-+++ SuiteSparse-5.10.1/SuiteSparse_config/SuiteSparse_config.mk	2021-10-15 13:20:25.381535826 +0330
-@@ -146,7 +146,7 @@
-         endif
-     endif
- 
--    CMAKE_OPTIONS += -DCMAKE_CXX_COMPILER=$(CXX) -DCMAKE_C_COMPILER=$(CC)
-+    CMAKE_OPTIONS += -DCMAKE_CXX_COMPILER=g++ -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_C_COMPILER=gcc -DCMAKE_C_FLAGS=-m32
- 
-     #---------------------------------------------------------------------------
-     # CFLAGS for the C/C++ compiler
-@@ -224,8 +224,8 @@
-     #---------------------------------------------------------------------------
- 
-     # CUDA is detected automatically, and used if found.  To disable CUDA,
--    # use CUDA=no
--    CUDA = auto
-+    CUDA=no
-+    # CUDA = auto
- 
-     ifneq ($(CUDA),no)
-         CUDA_PATH = $(shell which nvcc 2>/dev/null | sed "s/\/bin\/nvcc//")
+@@ -327,7 +327,7 @@
+     SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "-fprofile-arcs -ftest-coverage")
+ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+     # using Intel C++
+-    SET(CMAKE_CXX_FLAGS "-O3 -no-prec-div -xHOST -ipo -fwrapv")
++    SET(CMAKE_CXX_FLAGS "-m32 -O3 -no-prec-div -xHOST -ipo -fwrapv")
+     # Debug flags for Intel
+     SET(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -fwrapv")
+     SET(CMAKE_C_FLAGS_DEBUG "-g -O0 -Wall")
diff --git a/suitesparse-no-demo.patch b/suitesparse-no-demo.patch
deleted file mode 100644
index 99967a57fc67..000000000000
--- a/suitesparse-no-demo.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ruN SuiteSparse-5.10.1.orig/Makefile SuiteSparse-5.10.1/Makefile
---- SuiteSparse-5.10.1.orig/Makefile	2021-05-18 17:31:16.000000000 +0430
-+++ SuiteSparse-5.10.1/Makefile	2021-10-15 13:16:39.664963751 +0330
-@@ -16,26 +16,26 @@
- # installs all libraries SuiteSparse/lib.
- go: metis
- 	( cd SuiteSparse_config && $(MAKE) )
--	( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
--	( cd AMD && $(MAKE) )
--	( cd BTF && $(MAKE) )
--	( cd CAMD && $(MAKE) )
--	( cd CCOLAMD && $(MAKE) )
--	( cd COLAMD && $(MAKE) )
--	( cd CHOLMOD && $(MAKE) )
--	( cd CSparse && $(MAKE) )
--	( cd CXSparse && $(MAKE) )
--	( cd LDL && $(MAKE) )
--	( cd KLU && $(MAKE) )
--	( cd UMFPACK && $(MAKE) )
--	( cd RBio && $(MAKE) )
-+	( cd Mongoose && $(MAKE) library CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
-+	( cd AMD && $(MAKE) library )
-+	( cd BTF && $(MAKE) library )
-+	( cd CAMD && $(MAKE) library )
-+	( cd CCOLAMD && $(MAKE) library )
-+	( cd COLAMD && $(MAKE) library )
-+	( cd CHOLMOD && $(MAKE) library )
-+	( cd CSparse && $(MAKE) library )
-+	( cd CXSparse && $(MAKE) library )
-+	( cd LDL && $(MAKE) library )
-+	( cd KLU && $(MAKE) library )
-+	( cd UMFPACK && $(MAKE) library )
-+	( cd RBio && $(MAKE) library )
- ifneq ($(GPU_CONFIG),)
- 	( cd SuiteSparse_GPURuntime && $(MAKE) )
- 	( cd GPUQREngine && $(MAKE) )
- endif
--	( cd SPQR && $(MAKE) )
-+	( cd SPQR && $(MAKE) library )
- 	( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
--	( cd SLIP_LU && $(MAKE) )
-+	( cd SLIP_LU && $(MAKE) library )
- #	( cd PIRO_BAND && $(MAKE) )
- #	( cd SKYLINE_SVD && $(MAKE) )
-