From e71df1a8bb00c57353b3cbb31d510838c424bdff Mon Sep 17 00:00:00 2001
From: David Hagen <david@drhagen.com>
Date: Wed, 21 Feb 2018 00:04:02 -0500
Subject: [PATCH] suitesparse: Install static libraries (#3420)

* suitesparse: Install static libraries

The compilation currently generates the static libraries, but does not install them. This adds a patch which modifies the makefiles to copy the static libraries to the install directory.

* Increment pkgrel
---
 .../0004-mingw-w64-install-static-libs.patch  | 266 ++++++++++++++++++
 mingw-w64-suitesparse/PKGBUILD                |   9 +-
 2 files changed, 272 insertions(+), 3 deletions(-)
 create mode 100644 mingw-w64-suitesparse/0004-mingw-w64-install-static-libs.patch

diff --git a/mingw-w64-suitesparse/0004-mingw-w64-install-static-libs.patch b/mingw-w64-suitesparse/0004-mingw-w64-install-static-libs.patch
new file mode 100644
index 0000000000..7ea0e45ba9
--- /dev/null
+++ b/mingw-w64-suitesparse/0004-mingw-w64-install-static-libs.patch
@@ -0,0 +1,266 @@
+diff -urN SuiteSparse.orig/AMD/Lib/Makefile SuiteSparse/AMD/Lib/Makefile
+--- SuiteSparse.orig/AMD/Lib/Makefile	2017-10-27 14:05:20.073277700 -0400
++++ SuiteSparse/AMD/Lib/Makefile	2017-10-27 14:27:09.455884200 -0400
+@@ -82,6 +82,7 @@
+ 
+ # install AMD
+ install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET)
++	$(CP) $(AR_TARGET) $(INSTALL_LIB)
+ 
+ $(INSTALL_SO)/$(SO_TARGET): $(OBJ)
+ 	@mkdir -p $(INSTALL_LIB)
+@@ -98,6 +99,7 @@
+ 
+ # uninstall AMD
+ uninstall:
++	$(RM) $(INSTALL_LIB)/$(AR_TARGET)
+ 	$(RM) $(INSTALL_SO)/$(SO_TARGET)
+ 	$(RM) $(INSTALL_INCLUDE)/amd.h
+ 	$(RM) $(INSTALL_DOC)/AMD_UserGuide.pdf
+diff -urN SuiteSparse.orig/BTF/Lib/Makefile SuiteSparse/BTF/Lib/Makefile
+--- SuiteSparse.orig/BTF/Lib/Makefile	2017-10-27 14:05:20.081316500 -0400
++++ SuiteSparse/BTF/Lib/Makefile	2017-10-27 14:27:21.347044000 -0400
+@@ -67,6 +67,7 @@
+ 
+ # install BTF
+ install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET)
++	$(CP) $(AR_TARGET) $(INSTALL_LIB)
+ 
+ $(INSTALL_SO)/$(SO_TARGET): $(OBJ)
+ 	@mkdir -p $(INSTALL_LIB)
+@@ -80,6 +81,7 @@
+ 	chmod 644 $(INSTALL_DOC)/BTF_README.txt
+ 
+ uninstall:
++	$(RM) $(INSTALL_LIB)/$(AR_TARGET)
+ 	$(RM) $(INSTALL_SO)/$(SO_TARGET)
+ 	$(RM) $(INSTALL_INCLUDE)/btf.h
+ 	$(RM) $(INSTALL_DOC)/BTF_README.txt
+diff -urN SuiteSparse.orig/CAMD/Lib/Makefile SuiteSparse/CAMD/Lib/Makefile
+--- SuiteSparse.orig/CAMD/Lib/Makefile	2017-10-27 14:05:20.090337000 -0400
++++ SuiteSparse/CAMD/Lib/Makefile	2017-10-27 14:27:35.585799200 -0400
+@@ -63,6 +63,7 @@
+ 
+ # install CAMD
+ install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET)
++	$(CP) $(AR_TARGET) $(INSTALL_LIB)
+ 
+ $(INSTALL_SO)/$(SO_TARGET): $(OBJ)
+ 	@mkdir -p $(INSTALL_LIB)
+@@ -79,6 +80,7 @@
+ 
+ # uninstall CAMD
+ uninstall:
++	$(RM) $(INSTALL_LIB)/$(AR_TARGET)
+ 	$(RM) $(INSTALL_SO)/$(SO_TARGET)
+ 	$(RM) $(INSTALL_INCLUDE)/camd.h
+ 	$(RM) $(INSTALL_DOC)/CAMD_UserGuide.pdf
+diff -urN SuiteSparse.orig/CCOLAMD/Lib/Makefile SuiteSparse/CCOLAMD/Lib/Makefile
+--- SuiteSparse.orig/CCOLAMD/Lib/Makefile	2017-10-27 14:05:20.100348700 -0400
++++ SuiteSparse/CCOLAMD/Lib/Makefile	2017-10-27 14:27:49.406174400 -0400
+@@ -50,6 +50,7 @@
+ 
+ # install CCOLAMD
+ install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET)
++	$(CP) $(AR_TARGET) $(INSTALL_LIB)
+ 
+ $(INSTALL_SO)/$(SO_TARGET): $(OBJ)
+ 	@mkdir -p $(INSTALL_LIB)
+@@ -63,6 +64,7 @@
+ 	chmod 644 $(INSTALL_DOC)/CCOLAMD_README.txt
+ 
+ uninstall:
++	$(RM) $(INSTALL_LIB)/$(AR_TARGET)
+ 	$(RM) $(INSTALL_SO)/$(SO_TARGET)
+ 	$(RM) $(INSTALL_INCLUDE)/ccolamd.h
+ 	$(RM) $(INSTALL_DOC)/CCOLAMD_README.txt
+diff -urN SuiteSparse.orig/CHOLMOD/Lib/Makefile SuiteSparse/CHOLMOD/Lib/Makefile
+--- SuiteSparse.orig/CHOLMOD/Lib/Makefile	2017-10-27 14:05:20.108369700 -0400
++++ SuiteSparse/CHOLMOD/Lib/Makefile	2017-10-27 14:28:03.044074400 -0400
+@@ -536,6 +536,7 @@
+ 
+ # install CHOLMOD
+ install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET)
++	$(CP) $(AR_TARGET) $(INSTALL_LIB)
+ 
+ $(INSTALL_SO)/$(SO_TARGET): $(OBJ)
+ 	@mkdir -p $(INSTALL_LIB)
+@@ -553,6 +554,7 @@
+ 
+ # uninstall CHOLMOD
+ uninstall:
++	$(RM) $(INSTALL_LIB)/$(AR_TARGET)
+ 	$(RM) $(INSTALL_SO)/$(SO_TARGET)
+ 	$(RM) $(INSTALL_INCLUDE)/cholmod*.h
+ 	$(RM) $(INSTALL_DOC)/CHOLMOD_UserGuide.pdf
+diff -urN SuiteSparse.orig/COLAMD/Lib/Makefile SuiteSparse/COLAMD/Lib/Makefile
+--- SuiteSparse.orig/COLAMD/Lib/Makefile	2017-10-27 14:05:20.116391700 -0400
++++ SuiteSparse/COLAMD/Lib/Makefile	2017-10-27 14:28:14.342235400 -0400
+@@ -50,6 +50,7 @@
+ 
+ # install COLAMD
+ install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET)
++	$(CP) $(AR_TARGET) $(INSTALL_LIB)
+ 
+ $(INSTALL_SO)/$(SO_TARGET): $(OBJ)
+ 	@mkdir -p $(INSTALL_LIB)
+@@ -63,6 +64,7 @@
+ 	chmod 644 $(INSTALL_DOC)/COLAMD_README.txt
+ 
+ uninstall:
++	$(RM) $(INSTALL_LIB)/$(AR_TARGET)
+ 	$(RM) $(INSTALL_SO)/$(SO_TARGET)
+ 	$(RM) $(INSTALL_INCLUDE)/colamd.h
+ 	$(RM) $(INSTALL_DOC)/COLAMD_README.txt
+diff -urN SuiteSparse.orig/CXSparse/Lib/Makefile SuiteSparse/CXSparse/Lib/Makefile
+--- SuiteSparse.orig/CXSparse/Lib/Makefile	2017-10-27 14:05:20.124412700 -0400
++++ SuiteSparse/CXSparse/Lib/Makefile	2017-10-27 14:28:42.936134900 -0400
+@@ -114,6 +114,7 @@
+ 
+ # install CXSparse
+ install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET)
++	$(CP) $(AR_TARGET) $(INSTALL_LIB)
+ 
+ $(INSTALL_SO)/$(SO_TARGET): $(CS)
+ 	@mkdir -p $(INSTALL_LIB)
+@@ -128,6 +129,7 @@
+ 
+ # uninstall CXSparse
+ uninstall:
++	$(RM) $(INSTALL_LIB)/$(AR_TARGET)
+ 	$(RM) $(INSTALL_SO)/$(SO_TARGET)
+ 	$(RM) $(INSTALL_INCLUDE)/cs.h
+ 	$(RM) $(INSTALL_DOC)/CXSPARSE_README.txt
+diff -urN SuiteSparse.orig/CXSparse_newfiles/Lib/Makefile SuiteSparse/CXSparse_newfiles/Lib/Makefile
+--- SuiteSparse.orig/CXSparse_newfiles/Lib/Makefile	2017-10-27 14:05:20.132434700 -0400
++++ SuiteSparse/CXSparse_newfiles/Lib/Makefile	2017-10-27 14:28:58.098502000 -0400
+@@ -114,6 +114,7 @@
+ 
+ # install CXSparse
+ install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET)
++	$(CP) $(AR_TARGET) $(INSTALL_LIB)
+ 
+ $(INSTALL_SO)/$(SO_TARGET): $(CS)
+ 	@mkdir -p $(INSTALL_LIB)
+@@ -128,6 +129,7 @@
+ 
+ # uninstall CXSparse
+ uninstall:
++	$(RM) $(INSTALL_LIB)/$(AR_TARGET)
+ 	$(RM) $(INSTALL_SO)/$(SO_TARGET)
+ 	$(RM) $(INSTALL_INCLUDE)/cs.h
+ 	$(RM) $(INSTALL_DOC)/CXSPARSE_README.txt
+diff -urN SuiteSparse.orig/KLU/Lib/Makefile SuiteSparse/KLU/Lib/Makefile
+--- SuiteSparse.orig/KLU/Lib/Makefile	2017-10-27 14:05:20.150482700 -0400
++++ SuiteSparse/KLU/Lib/Makefile	2017-10-27 14:29:21.673082300 -0400
+@@ -264,6 +264,7 @@
+ 
+ # install KLU
+ install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET)
++	$(CP) $(AR_TARGET) $(INSTALL_LIB)
+ 
+ $(INSTALL_SO)/$(SO_TARGET): $(OBJ)
+ 	@mkdir -p $(INSTALL_LIB)
+@@ -280,6 +281,7 @@
+ 
+ # uninstall KLU
+ uninstall:
++	$(RM) $(INSTALL_LIB)/$(AR_TARGET)
+ 	$(RM) $(INSTALL_SO)/$(SO_TARGET)
+ 	$(RM) $(INSTALL_INCLUDE)/klu.h
+ 	$(RM) $(INSTALL_DOC)/KLU_UserGuide.pdf
+diff -urN SuiteSparse.orig/LDL/Lib/Makefile SuiteSparse/LDL/Lib/Makefile
+--- SuiteSparse.orig/LDL/Lib/Makefile	2017-10-27 14:05:20.158534300 -0400
++++ SuiteSparse/LDL/Lib/Makefile	2017-10-27 14:29:32.417628700 -0400
+@@ -47,6 +47,7 @@
+ 
+ # install LDL
+ install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET)
++	$(CP) $(AR_TARGET) $(INSTALL_LIB)
+ 
+ $(INSTALL_SO)/$(SO_TARGET): $(OBJ)
+ 	@mkdir -p $(INSTALL_LIB)
+@@ -63,6 +64,7 @@
+ 
+ # uninstall LDL
+ uninstall:
++	$(RM) $(INSTALL_LIB)/$(AR_TARGET)
+ 	$(RM) $(INSTALL_SO)/$(SO_TARGET)
+ 	$(RM) $(INSTALL_INCLUDE)/ldl.h
+ 	$(RM) $(INSTALL_DOC)/ldl_userguide.pdf
+diff -urN SuiteSparse.orig/RBio/Lib/Makefile SuiteSparse/RBio/Lib/Makefile
+--- SuiteSparse.orig/RBio/Lib/Makefile	2017-10-27 14:05:20.173544900 -0400
++++ SuiteSparse/RBio/Lib/Makefile	2017-10-27 14:29:44.135822900 -0400
+@@ -61,6 +61,7 @@
+ 
+ # install RBio
+ install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET)
++	$(CP) $(AR_TARGET) $(INSTALL_LIB)
+ 
+ $(INSTALL_SO)/$(SO_TARGET): $(OBJ)
+ 	@mkdir -p $(INSTALL_LIB)
+@@ -75,6 +76,7 @@
+ 
+ # uninstall RBio
+ uninstall:
++	$(RM) $(INSTALL_LIB)/$(AR_TARGET)
+ 	$(RM) $(INSTALL_SO)/$(SO_TARGET)
+ 	$(RM) $(INSTALL_INCLUDE)/RBio.h
+ 	$(RM) $(INSTALL_DOC)/RBIO_README.txt
+diff -urN SuiteSparse.orig/SPQR/Lib/Makefile SuiteSparse/SPQR/Lib/Makefile
+--- SuiteSparse.orig/SPQR/Lib/Makefile	2017-10-27 14:05:20.182568000 -0400
++++ SuiteSparse/SPQR/Lib/Makefile	2017-10-27 14:29:59.827071800 -0400
+@@ -243,6 +243,7 @@
+ 
+ # install SPQR
+ install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET)
++	$(CP) $(AR_TARGET) $(INSTALL_LIB)
+ 
+ $(INSTALL_SO)/$(SO_TARGET): $(OBJ)
+ 	@mkdir -p $(INSTALL_LIB)
+@@ -265,6 +266,7 @@
+ 
+ # uninstall SPQR
+ uninstall:
++	$(RM) $(INSTALL_LIB)/$(AR_TARGET)
+ 	$(RM) $(INSTALL_SO)/$(SO_TARGET)
+ 	$(RM) $(INSTALL_INCLUDE)/SuiteSparseQR.hpp
+ 	$(RM) $(INSTALL_INCLUDE)/SuiteSparseQR_C.h
+diff -urN SuiteSparse.orig/SuiteSparse_config/Makefile SuiteSparse/SuiteSparse_config/Makefile
+--- SuiteSparse.orig/SuiteSparse_config/Makefile	2017-10-27 14:05:20.189586400 -0400
++++ SuiteSparse/SuiteSparse_config/Makefile	2017-10-27 14:30:14.135924600 -0400
+@@ -45,6 +45,7 @@
+ 
+ # install SuiteSparse_config
+ install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET)
++	$(CP) $(AR_TARGET) $(INSTALL_LIB)
+ 
+ $(INSTALL_SO)/$(SO_TARGET): $(OBJ)
+ 	@mkdir -p $(INSTALL_LIB)
+@@ -59,6 +60,7 @@
+ 
+ # uninstall SuiteSparse_config
+ uninstall:
++	$(RM) $(INSTALL_LIB)/$(AR_TARGET)
+ 	$(RM) $(INSTALL_SO)/$(SO_TARGET)
+ 	$(RM) $(INSTALL_INCLUDE)/SuiteSparse_config.h
+ 	$(RM) $(INSTALL_DOC)/SUITESPARSECONFIG_README.txt
+diff -urN SuiteSparse.orig/UMFPACK/Lib/Makefile SuiteSparse/UMFPACK/Lib/Makefile
+--- SuiteSparse.orig/UMFPACK/Lib/Makefile	2017-10-27 14:05:20.225681300 -0400
++++ SuiteSparse/UMFPACK/Lib/Makefile	2017-10-27 14:30:29.018341400 -0400
+@@ -289,6 +289,7 @@
+ #-------------------------------------------------------------------------------
+ # install UMFPACK
+ install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET)
++	$(CP) $(AR_TARGET) $(INSTALL_LIB)
+ 
+ $(INSTALL_SO)/$(SO_TARGET): $(OBJ)
+ 	@mkdir -p $(INSTALL_LIB)
+@@ -307,6 +308,7 @@
+ 
+ # uninstall UMFPACK
+ uninstall:
++	$(RM) $(INSTALL_LIB)/$(AR_TARGET)
+ 	$(RM) $(INSTALL_SO)/$(SO_TARGET)
+ 	$(RM) $(INSTALL_INCLUDE)/umfpack*.h
+ 	$(RM) $(INSTALL_DOC)/UMFPACK_UserGuide.pdf
diff --git a/mingw-w64-suitesparse/PKGBUILD b/mingw-w64-suitesparse/PKGBUILD
index 1dfd28de77..fcea8b76e3 100644
--- a/mingw-w64-suitesparse/PKGBUILD
+++ b/mingw-w64-suitesparse/PKGBUILD
@@ -4,7 +4,7 @@ _realname=suitesparse
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-suitesparse")
 pkgver=5.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A suite of sparse matrix algorithms (mingw-w64)'
 url="http://faculty.cse.tamu.edu/davis/suitesparse.html"
 license=('GPL')
@@ -12,7 +12,8 @@ arch=('any')
 source=("http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${pkgver}.tar.gz"
         "0001-mingw-w64-Use-a-not-lib-as-AR_TARGET-extension.patch"
         "0002-mingw-w64-Set-SO_OPTS--shared-move-dlls-create-import-libs.patch"
-        "0003-mingw-w64-no-CUDA.patch")
+        "0003-mingw-w64-no-CUDA.patch"
+        "0004-mingw-w64-install-static-libs.patch")
 depends=("${MINGW_PACKAGE_PREFIX}-openblas"
          "${MINGW_PACKAGE_PREFIX}-metis")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake")
@@ -20,13 +21,15 @@ options=('staticlibs')
 sha256sums=('4ec8d344bd8e95b898132ddffd7ee93bfbb2c1224925d11bab844b08f9b4c3b7'
             '1c848ba4fd5b07d65e0f8e9f6d5153efc51292d0d487d446afbdacf25e4fd8f7'
             '6f6a96a801c7da927b1ebed309ec067b4aa8408a79a9de6e08b853413e793a53'
-            'ba683605113eac73eaa63cb1b24fde8110f395c888f5331870222f59ecdc354a')
+            'ba683605113eac73eaa63cb1b24fde8110f395c888f5331870222f59ecdc354a'
+            'ca8aa0a8c3828ae7e2b5ae53c9e5c5c581d613f11763c23d648b38d8c8909485')
 
 prepare() {
   cd "${srcdir}"/SuiteSparse
   patch -p1 -i "${srcdir}"/0001-mingw-w64-Use-a-not-lib-as-AR_TARGET-extension.patch
   patch -p1 -i "${srcdir}"/0002-mingw-w64-Set-SO_OPTS--shared-move-dlls-create-import-libs.patch
   patch -p1 -i "${srcdir}"/0003-mingw-w64-no-CUDA.patch
+  patch -p1 -i "${srcdir}"/0004-mingw-w64-install-static-libs.patch
 }
 
 build() {