From f1b28aef2f5497c5d9bfba62a24a93e5d16537bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Sat, 9 Dec 2023 22:24:28 +0100 Subject: [PATCH] drop 32bit environments from some scientific packages --- mingw-w64-amgcl/PKGBUILD | 2 +- mingw-w64-armadillo/PKGBUILD | 2 +- mingw-w64-dlib/PKGBUILD | 2 +- mingw-w64-dsdp/PKGBUILD | 2 +- mingw-w64-ensmallen/PKGBUILD | 2 +- mingw-w64-flint/PKGBUILD | 2 +- mingw-w64-hypre/PKGBUILD | 2 +- mingw-w64-igraph/PKGBUILD | 2 +- mingw-w64-libexodus/PKGBUILD | 2 +- mingw-w64-lis/PKGBUILD | 2 +- mingw-w64-metis/PKGBUILD | 2 +- mingw-w64-mfem/PKGBUILD | 2 +- mingw-w64-mlpack/PKGBUILD | 2 +- mingw-w64-moab/PKGBUILD | 2 +- mingw-w64-msmpi/PKGBUILD | 2 +- mingw-w64-mumps/PKGBUILD | 2 +- mingw-w64-openturns/PKGBUILD | 2 +- mingw-w64-parmetis/PKGBUILD | 2 +- mingw-w64-pastix/PKGBUILD | 2 +- mingw-w64-scalapack/PKGBUILD | 2 +- mingw-w64-scotch/PKGBUILD | 2 +- mingw-w64-seacas/PKGBUILD | 2 +- ...Use-a-not-lib-as-AR_TARGET-extension.patch | 12 - ...-shared-move-dlls-create-import-libs.patch | 672 ------------------ .../0003-mingw-w64-no-CUDA.patch | 12 - .../0004-mingw-w64-install-static-libs.patch | 278 -------- ...8.1-skip-building-Mongoose-GraphBLAS.patch | 86 --- ...-suitesparse-5.8.1-fix-mp-link-order.patch | 12 - mingw-w64-suitesparse5/PKGBUILD | 112 --- mingw-w64-superlu/PKGBUILD | 2 +- mingw-w64-superlu_dist/PKGBUILD | 2 +- 31 files changed, 24 insertions(+), 1208 deletions(-) delete mode 100644 mingw-w64-suitesparse5/0001-mingw-w64-Use-a-not-lib-as-AR_TARGET-extension.patch delete mode 100644 mingw-w64-suitesparse5/0002-mingw-w64-Set-SO_OPTS--shared-move-dlls-create-import-libs.patch delete mode 100644 mingw-w64-suitesparse5/0003-mingw-w64-no-CUDA.patch delete mode 100644 mingw-w64-suitesparse5/0004-mingw-w64-install-static-libs.patch delete mode 100644 mingw-w64-suitesparse5/0005-suitesparse-5.8.1-skip-building-Mongoose-GraphBLAS.patch delete mode 100644 mingw-w64-suitesparse5/0006-suitesparse-5.8.1-fix-mp-link-order.patch delete mode 100644 mingw-w64-suitesparse5/PKGBUILD diff --git a/mingw-w64-amgcl/PKGBUILD b/mingw-w64-amgcl/PKGBUILD index 65e123e0f7..1d72ad2344 100644 --- a/mingw-w64-amgcl/PKGBUILD +++ b/mingw-w64-amgcl/PKGBUILD @@ -7,7 +7,7 @@ pkgver=1.4.3 pkgrel=1 pkgdesc="AMGCL is a header-only C++ library for solving large sparse linear systems with algebraic multigrid (AMG) method. (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64') url='http://amgcl.readthedocs.io/' license=('MIT') makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" diff --git a/mingw-w64-armadillo/PKGBUILD b/mingw-w64-armadillo/PKGBUILD index 502b0c221b..ec60f96848 100644 --- a/mingw-w64-armadillo/PKGBUILD +++ b/mingw-w64-armadillo/PKGBUILD @@ -7,7 +7,7 @@ pkgver=12.6.4 pkgrel=1 pkgdesc="Fast C++ matrix library with syntax similar to MATLAB and Octave (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://arma.sourceforge.io/" license=('spdx:Apache-2.0') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" diff --git a/mingw-w64-dlib/PKGBUILD b/mingw-w64-dlib/PKGBUILD index d75a76d042..8aaed68167 100644 --- a/mingw-w64-dlib/PKGBUILD +++ b/mingw-w64-dlib/PKGBUILD @@ -7,7 +7,7 @@ pkgver=19.24.2 pkgrel=2 pkgdesc="A toolkit for making real world machine learning and data analysis applications in C++ (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url='http://dlib.net/' license=('spdx:BSL-1.0') depends=("${MINGW_PACKAGE_PREFIX}-giflib" diff --git a/mingw-w64-dsdp/PKGBUILD b/mingw-w64-dsdp/PKGBUILD index 7d4ae4767c..b4e0d20d79 100644 --- a/mingw-w64-dsdp/PKGBUILD +++ b/mingw-w64-dsdp/PKGBUILD @@ -9,7 +9,7 @@ pkgver=5.8 pkgrel=4 pkgdesc="A free open source implementation of an interior-point method for semidefinite programming (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://www.mcs.anl.gov/hs/software/DSDP" license=('custom') depends=("${MINGW_PACKAGE_PREFIX}-openblas") diff --git a/mingw-w64-ensmallen/PKGBUILD b/mingw-w64-ensmallen/PKGBUILD index 395eb17f1a..50230c03e0 100644 --- a/mingw-w64-ensmallen/PKGBUILD +++ b/mingw-w64-ensmallen/PKGBUILD @@ -7,7 +7,7 @@ pkgver=2.19.1 pkgrel=1 pkgdesc='flexible C++ library for efficient mathematical optimization (mingw-w64)' arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url='https://www.ensmallen.org/' license=('BSD') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" diff --git a/mingw-w64-flint/PKGBUILD b/mingw-w64-flint/PKGBUILD index fea3b7ad3a..106ea73fe3 100644 --- a/mingw-w64-flint/PKGBUILD +++ b/mingw-w64-flint/PKGBUILD @@ -7,7 +7,7 @@ pkgver=3.0.1 pkgrel=2 pkgdesc="Fast Library for Number Theory (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://www.flintlib.org/" license=('spdx:LGPL-2.1-or-later') msys2_repository_url="https://github.com/flintlib/flint" diff --git a/mingw-w64-hypre/PKGBUILD b/mingw-w64-hypre/PKGBUILD index 7d5adb62d5..653182b64d 100644 --- a/mingw-w64-hypre/PKGBUILD +++ b/mingw-w64-hypre/PKGBUILD @@ -7,7 +7,7 @@ pkgver=2.30.0 pkgrel=1 pkgdesc='A library for solving large, sparse linear systems on massively parallel computers (mingw-w64)' arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64') msys2_references=( 'aur: hypre' ) diff --git a/mingw-w64-igraph/PKGBUILD b/mingw-w64-igraph/PKGBUILD index aecc1e1b24..10476232d7 100644 --- a/mingw-w64-igraph/PKGBUILD +++ b/mingw-w64-igraph/PKGBUILD @@ -7,7 +7,7 @@ pkgver=0.10.8 pkgrel=2 pkgdesc="Library for the analysis of networks (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') msys2_references=( 'archlinux: igraph' ) diff --git a/mingw-w64-libexodus/PKGBUILD b/mingw-w64-libexodus/PKGBUILD index da097c6098..8545803b0d 100644 --- a/mingw-w64-libexodus/PKGBUILD +++ b/mingw-w64-libexodus/PKGBUILD @@ -9,7 +9,7 @@ pkgver=8.19 pkgrel=1 pkgdesc="EXODUS is a model developed to store and retrieve data for finite element analyses (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64') +mingw_arch=('mingw64' 'ucrt64') conflicts=("${MINGW_PACKAGE_PREFIX}-seacas" "${MINGW_PACKAGE_PREFIX}-trilinos") depends=($([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran") diff --git a/mingw-w64-lis/PKGBUILD b/mingw-w64-lis/PKGBUILD index 575206e69b..aabca6ed47 100644 --- a/mingw-w64-lis/PKGBUILD +++ b/mingw-w64-lis/PKGBUILD @@ -7,7 +7,7 @@ pkgver=2.0.33 pkgrel=3 pkgdesc='Library of Iterative Solvers for linear systems (mingw-w64)' arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64') depends=("${MINGW_PACKAGE_PREFIX}-msmpi") makedepends=("${MINGW_PACKAGE_PREFIX}-msmpi" "${MINGW_PACKAGE_PREFIX}-autotools") options=('!docs') diff --git a/mingw-w64-metis/PKGBUILD b/mingw-w64-metis/PKGBUILD index a39f77eacf..bb2f21df66 100644 --- a/mingw-w64-metis/PKGBUILD +++ b/mingw-w64-metis/PKGBUILD @@ -7,7 +7,7 @@ pkgver=5.1.0 pkgrel=4 pkgdesc="Serial Graph Partitioning and Fill-reducing Matrix Ordering (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url='http://glaros.dtc.umn.edu/gkhome/views/metis' license=('Apache') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") diff --git a/mingw-w64-mfem/PKGBUILD b/mingw-w64-mfem/PKGBUILD index 777567f3b1..395bf9f7f5 100644 --- a/mingw-w64-mfem/PKGBUILD +++ b/mingw-w64-mfem/PKGBUILD @@ -8,7 +8,7 @@ pkgver=4.6 pkgrel=1 pkgdesc='Lightweight, general, scalable C++ library for finite element methods (mingw-w64)' arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64') +mingw_arch=('mingw64' 'ucrt64') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" #"${MINGW_PACKAGE_PREFIX}-adios2" "${MINGW_PACKAGE_PREFIX}-hypre" diff --git a/mingw-w64-mlpack/PKGBUILD b/mingw-w64-mlpack/PKGBUILD index feffca35dd..a2c1cbf6ad 100644 --- a/mingw-w64-mlpack/PKGBUILD +++ b/mingw-w64-mlpack/PKGBUILD @@ -7,7 +7,7 @@ pkgver=4.2.1 pkgrel=1 pkgdesc='An intuitive, fast, scalable C++ machine learning library (mingw-w64)' arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url='https://mlpack.org/' license=('spdx:BSD-3-Clause') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" diff --git a/mingw-w64-moab/PKGBUILD b/mingw-w64-moab/PKGBUILD index df489fb520..e4d33c5b15 100644 --- a/mingw-w64-moab/PKGBUILD +++ b/mingw-w64-moab/PKGBUILD @@ -7,7 +7,7 @@ pkgver=5.3.1 pkgrel=3 pkgdesc='The Mesh-Oriented datABase MOAB is a component for representing and evaluating mesh data (mingw-w64)' arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64') depends=("${MINGW_PACKAGE_PREFIX}-eigen3" "${MINGW_PACKAGE_PREFIX}-msmpi" "${MINGW_PACKAGE_PREFIX}-openblas") diff --git a/mingw-w64-msmpi/PKGBUILD b/mingw-w64-msmpi/PKGBUILD index eae605af7b..c3a14629b6 100644 --- a/mingw-w64-msmpi/PKGBUILD +++ b/mingw-w64-msmpi/PKGBUILD @@ -7,7 +7,7 @@ pkgver=10.1.1 pkgrel=10 pkgdesc="Microsoft MPI SDK (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64') url="https://docs.microsoft.com/en-us/message-passing-interface/microsoft-mpi" license=('MIT') makedepends=("${MINGW_PACKAGE_PREFIX}-binutils" "${MINGW_PACKAGE_PREFIX}-cc") diff --git a/mingw-w64-mumps/PKGBUILD b/mingw-w64-mumps/PKGBUILD index 04b27f9611..a052f5a77f 100644 --- a/mingw-w64-mumps/PKGBUILD +++ b/mingw-w64-mumps/PKGBUILD @@ -32,7 +32,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=5.5.1 pkgrel=1 arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64') +mingw_arch=('mingw64' 'ucrt64') pkgdesc="Sparse direct SLAE solver (mingw-w64)" depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran") diff --git a/mingw-w64-openturns/PKGBUILD b/mingw-w64-openturns/PKGBUILD index 3805908ac4..7e82223eee 100644 --- a/mingw-w64-openturns/PKGBUILD +++ b/mingw-w64-openturns/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=2 pkgdesc="Uncertainty treatment library (mingw-w64)" license=('spdx:GPL-3.0-or-later') arch=(any) -mingw_arch=('mingw64' 'mingw32' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url="http://www.openturns.org/" depends=("${MINGW_PACKAGE_PREFIX}-ceres-solver" "${MINGW_PACKAGE_PREFIX}-hdf5" diff --git a/mingw-w64-parmetis/PKGBUILD b/mingw-w64-parmetis/PKGBUILD index 1e3be89081..e8b37b46f4 100644 --- a/mingw-w64-parmetis/PKGBUILD +++ b/mingw-w64-parmetis/PKGBUILD @@ -7,7 +7,7 @@ pkgver=4.0.3 pkgrel=3 pkgdesc="Parallel Graph Partitioning and Fill-reducing Matrix Ordering (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64') url='http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview' license=('Apache') depends=("${MINGW_PACKAGE_PREFIX}-metis>=5.1.0" "${MINGW_PACKAGE_PREFIX}-msmpi") diff --git a/mingw-w64-pastix/PKGBUILD b/mingw-w64-pastix/PKGBUILD index 4b1c1ceaa5..9e05de301e 100644 --- a/mingw-w64-pastix/PKGBUILD +++ b/mingw-w64-pastix/PKGBUILD @@ -7,7 +7,7 @@ pkgver=6.3.1 pkgrel=2 pkgdesc='High performance parallel solver for very large sparse linear systems based on direct methods (mingw-w64)' arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') +mingw_arch=('mingw64' 'ucrt64' 'clang64') msys2_references=( 'aur: pastix' ) diff --git a/mingw-w64-scalapack/PKGBUILD b/mingw-w64-scalapack/PKGBUILD index 7cdce72a46..4aa108d6b6 100644 --- a/mingw-w64-scalapack/PKGBUILD +++ b/mingw-w64-scalapack/PKGBUILD @@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.2.0 pkgrel=2 arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') +mingw_arch=('mingw64' 'ucrt64' 'clang64') pkgdesc="Scalable Linear Algebra PACKage (mingw-w64)" depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran") diff --git a/mingw-w64-scotch/PKGBUILD b/mingw-w64-scotch/PKGBUILD index 40dcc4819a..ecb0a1341a 100644 --- a/mingw-w64-scotch/PKGBUILD +++ b/mingw-w64-scotch/PKGBUILD @@ -8,7 +8,7 @@ pkgdesc='Graph partitioning and sparse matrix ordering package (mingw-w64)' pkgver=7.0.4 pkgrel=1 arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libsystre" "${MINGW_PACKAGE_PREFIX}-msmpi") diff --git a/mingw-w64-seacas/PKGBUILD b/mingw-w64-seacas/PKGBUILD index d74bfddacf..e0bc6ae11c 100644 --- a/mingw-w64-seacas/PKGBUILD +++ b/mingw-w64-seacas/PKGBUILD @@ -8,7 +8,7 @@ _releases=${pkgver//./-} pkgrel=1 pkgdesc="The Sandia Engineering Analysis Code Access System (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') conflicts=("${MINGW_PACKAGE_PREFIX}-libexodus") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-hdf5" diff --git a/mingw-w64-suitesparse5/0001-mingw-w64-Use-a-not-lib-as-AR_TARGET-extension.patch b/mingw-w64-suitesparse5/0001-mingw-w64-Use-a-not-lib-as-AR_TARGET-extension.patch deleted file mode 100644 index ca2ba4ceb3..0000000000 --- a/mingw-w64-suitesparse5/0001-mingw-w64-Use-a-not-lib-as-AR_TARGET-extension.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk.orig SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk ---- SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk.orig 2022-03-21 19:28:13.026738300 +0100 -+++ SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk 2022-03-21 19:31:47.757136900 +0100 -@@ -440,7 +440,7 @@ - - ifeq ($(UNAME),Windows) - # Cygwin Make on Windows -- AR_TARGET = $(LIBRARY).lib -+ AR_TARGET = $(LIBRARY).a - SO_TARGET = $(LIBRARY).dll - # The following two links are just garbage copies of the real target - # they aren't actually supported by this OS diff --git a/mingw-w64-suitesparse5/0002-mingw-w64-Set-SO_OPTS--shared-move-dlls-create-import-libs.patch b/mingw-w64-suitesparse5/0002-mingw-w64-Set-SO_OPTS--shared-move-dlls-create-import-libs.patch deleted file mode 100644 index ecb9566528..0000000000 --- a/mingw-w64-suitesparse5/0002-mingw-w64-Set-SO_OPTS--shared-move-dlls-create-import-libs.patch +++ /dev/null @@ -1,672 +0,0 @@ -diff -urN SuiteSparse.orig/AMD/Lib/Makefile SuiteSparse/AMD/Lib/Makefile ---- SuiteSparse.orig/AMD/Lib/Makefile 2017-05-01 17:08:36.145856600 +0100 -+++ SuiteSparse/AMD/Lib/Makefile 2017-05-01 16:24:28.606356000 +0100 -@@ -81,28 +81,24 @@ - #------------------------------------------------------------------------------- - - # install AMD --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/amd.h $(INSTALL_INCLUDE) - $(CP) ../Doc/AMD_UserGuide.pdf $(INSTALL_DOC) - $(CP) ../README.txt $(INSTALL_DOC)/AMD_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/amd.h - chmod 644 $(INSTALL_DOC)/AMD_UserGuide.pdf - chmod 644 $(INSTALL_DOC)/AMD_README.txt - - # uninstall AMD - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/amd.h - $(RM) $(INSTALL_DOC)/AMD_UserGuide.pdf - $(RM) $(INSTALL_DOC)/AMD_README.txt -diff -urN SuiteSparse.orig/BTF/Lib/Makefile SuiteSparse/BTF/Lib/Makefile ---- SuiteSparse.orig/BTF/Lib/Makefile 2017-05-01 17:08:36.159359300 +0100 -+++ SuiteSparse/BTF/Lib/Makefile 2017-05-01 16:24:28.616354400 +0100 -@@ -66,25 +66,21 @@ - #------------------------------------------------------------------------------- - - # install BTF --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/btf.h $(INSTALL_INCLUDE) - $(CP) ../README.txt $(INSTALL_DOC)/BTF_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/btf.h - chmod 644 $(INSTALL_DOC)/BTF_README.txt - - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(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-05-01 17:08:36.229858300 +0100 -+++ SuiteSparse/CAMD/Lib/Makefile 2017-05-01 16:24:28.628355400 +0100 -@@ -62,28 +62,24 @@ - #------------------------------------------------------------------------------- - - # install CAMD --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/camd.h $(INSTALL_INCLUDE) - $(CP) ../Doc/CAMD_UserGuide.pdf $(INSTALL_DOC) - $(CP) ../README.txt $(INSTALL_DOC)/CAMD_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/camd.h - chmod 644 $(INSTALL_DOC)/CAMD_UserGuide.pdf - chmod 644 $(INSTALL_DOC)/CAMD_README.txt - - # uninstall CAMD - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/camd.h - $(RM) $(INSTALL_DOC)/CAMD_UserGuide.pdf - $(RM) $(INSTALL_DOC)/CAMD_README.txt -diff -urN SuiteSparse.orig/CCOLAMD/Lib/Makefile SuiteSparse/CCOLAMD/Lib/Makefile ---- SuiteSparse.orig/CCOLAMD/Lib/Makefile 2017-05-01 17:08:36.241860000 +0100 -+++ SuiteSparse/CCOLAMD/Lib/Makefile 2017-05-01 16:24:28.640355000 +0100 -@@ -49,25 +49,21 @@ - - $(RM) -r $(PURGE) - - # install CCOLAMD --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/ccolamd.h $(INSTALL_INCLUDE) - $(CP) ../README.txt $(INSTALL_DOC)/CCOLAMD_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/ccolamd.h - chmod 644 $(INSTALL_DOC)/CCOLAMD_README.txt - - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(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-05-01 17:08:36.260357100 +0100 -+++ SuiteSparse/CHOLMOD/Lib/Makefile 2017-05-01 16:24:28.650854700 +0100 -@@ -535,29 +535,25 @@ - #------------------------------------------------------------------------------- - - # install CHOLMOD --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CXX) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/cholmod*.h $(INSTALL_INCLUDE) - $(RM) $(INSTALL_INCLUDE)/cholmod_internal.h - $(CP) ../Doc/CHOLMOD_UserGuide.pdf $(INSTALL_DOC) - $(CP) ../README.txt $(INSTALL_DOC)/CHOLMOD_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/cholmod*.h - chmod 644 $(INSTALL_DOC)/CHOLMOD_UserGuide.pdf - chmod 644 $(INSTALL_DOC)/CHOLMOD_README.txt - - # uninstall CHOLMOD - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/cholmod*.h - $(RM) $(INSTALL_DOC)/CHOLMOD_UserGuide.pdf - $(RM) $(INSTALL_DOC)/CHOLMOD_README.txt -diff -urN SuiteSparse.orig/COLAMD/Lib/Makefile SuiteSparse/COLAMD/Lib/Makefile ---- SuiteSparse.orig/COLAMD/Lib/Makefile 2017-05-01 17:08:36.281357400 +0100 -+++ SuiteSparse/COLAMD/Lib/Makefile 2017-05-01 16:24:28.660355300 +0100 -@@ -49,25 +49,21 @@ - - $(RM) -r $(PURGE) - - # install COLAMD --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/colamd.h $(INSTALL_INCLUDE) - $(CP) ../README.txt $(INSTALL_DOC)/COLAMD_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/colamd.h - chmod 644 $(INSTALL_DOC)/COLAMD_README.txt - - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(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-05-01 17:08:36.295357600 +0100 -+++ SuiteSparse/CXSparse/Lib/Makefile 2017-05-01 16:24:28.669855300 +0100 -@@ -113,26 +113,22 @@ - - $(RM) -r $(PURGE) - - # install CXSparse --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(CS) -+$(INSTALL_SO)/$(SO_TARGET): $(CS) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/cs.h $(INSTALL_INCLUDE) - $(CP) ../README.txt $(INSTALL_DOC)/CXSPARSE_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/cs.h - chmod 644 $(INSTALL_DOC)/CXSPARSE_README.txt - - # uninstall CXSparse - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(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-05-01 17:08:36.309358100 +0100 -+++ SuiteSparse/CXSparse_newfiles/Lib/Makefile 2017-05-01 16:24:28.676354900 +0100 -@@ -113,26 +113,22 @@ - - $(RM) -r $(PURGE) - - # install CXSparse --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(CS) -+$(INSTALL_SO)/$(SO_TARGET): $(CS) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/cs.h $(INSTALL_INCLUDE) - $(CP) ../README.txt $(INSTALL_DOC)/CXSPARSE_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/cs.h - chmod 644 $(INSTALL_DOC)/CXSPARSE_README.txt - - # uninstall CXSparse - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/cs.h - $(RM) $(INSTALL_DOC)/CXSPARSE_README.txt - -diff -urN SuiteSparse.orig/GPUQREngine/Lib/Makefile SuiteSparse/GPUQREngine/Lib/Makefile ---- SuiteSparse.orig/GPUQREngine/Lib/Makefile 2017-05-01 17:08:36.324358000 +0100 -+++ SuiteSparse/GPUQREngine/Lib/Makefile 2017-05-01 16:24:28.685855200 +0100 -@@ -129,24 +129,20 @@ - #------------------------------------------------------------------------------- - - # install GPUQREngine. Note that the include files are not installed. --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJS) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJS) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CXX) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../README.txt $(INSTALL_DOC)/GPUQRENGINE_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_DOC)/GPUQRENGINE_README.txt - - # uninstall GPUQREngine - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_DOC)/GPUQRENGINE_README.txt - - #------------------------------------------------------------------------------- -diff -urN SuiteSparse.orig/KLU/Lib/Makefile SuiteSparse/KLU/Lib/Makefile ---- SuiteSparse.orig/KLU/Lib/Makefile 2017-05-01 17:08:36.342857200 +0100 -+++ SuiteSparse/KLU/Lib/Makefile 2017-05-01 16:24:28.695856500 +0100 -@@ -263,28 +263,24 @@ - #------------------------------------------------------------------------------- - - # install KLU --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/klu.h $(INSTALL_INCLUDE) - $(CP) ../Doc/KLU_UserGuide.pdf $(INSTALL_DOC) - $(CP) ../README.txt $(INSTALL_DOC)/KLU_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/klu.h - chmod 644 $(INSTALL_DOC)/KLU_UserGuide.pdf - chmod 644 $(INSTALL_DOC)/KLU_README.txt - - # uninstall KLU - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/klu.h - $(RM) $(INSTALL_DOC)/KLU_UserGuide.pdf - $(RM) $(INSTALL_DOC)/KLU_README.txt -diff -urN SuiteSparse.orig/LDL/Lib/Makefile SuiteSparse/LDL/Lib/Makefile ---- SuiteSparse.orig/LDL/Lib/Makefile 2017-05-01 17:08:36.356357000 +0100 -+++ SuiteSparse/LDL/Lib/Makefile 2017-05-01 16:24:28.705857500 +0100 -@@ -46,28 +46,24 @@ - - $(RM) -r $(CLEAN) - - # install LDL --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/ldl.h $(INSTALL_INCLUDE) - $(CP) ../Doc/ldl_userguide.pdf $(INSTALL_DOC) - $(CP) ../README.txt $(INSTALL_DOC)/LDL_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/ldl.h - chmod 644 $(INSTALL_DOC)/ldl_userguide.pdf - chmod 644 $(INSTALL_DOC)/LDL_README.txt - - # uninstall LDL - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/ldl.h - $(RM) $(INSTALL_DOC)/ldl_userguide.pdf - $(RM) $(INSTALL_DOC)/LDL_README.txt -diff -urN SuiteSparse.orig/Makefile SuiteSparse/Makefile ---- SuiteSparse.orig/Makefile 2017-05-01 17:08:36.371358100 +0100 -+++ SuiteSparse/Makefile 2017-05-01 17:09:24.703869100 +0100 -@@ -63,13 +63,13 @@ - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) -- - $(CP) lib/libmetis.* $(INSTALL_LIB) -+ - $(CP) lib/libmetis.* $(INSTALL_SO) - - $(CP) metis-5.1.0/manual/manual.pdf $(INSTALL_DOC)/METIS_manual.pdf - - $(CP) metis-5.1.0/README.txt $(INSTALL_DOC)/METIS_README.txt - # the following is needed only on the Mac, so *.dylib is hardcoded: - $(SO_INSTALL_NAME) $(INSTALL_LIB)/libmetis.dylib $(INSTALL_LIB)/libmetis.dylib - - $(CP) include/metis.h $(INSTALL_INCLUDE) -- chmod 755 $(INSTALL_LIB)/libmetis.* -+ chmod 755 $(INSTALL_SO)/libmetis.* - chmod 644 $(INSTALL_INCLUDE)/metis.h - chmod 644 $(INSTALL_DOC)/METIS_manual.pdf - chmod 644 $(INSTALL_DOC)/METIS_README.txt -diff -urN SuiteSparse.orig/RBio/Lib/Makefile SuiteSparse/RBio/Lib/Makefile ---- SuiteSparse.orig/RBio/Lib/Makefile 2017-05-01 17:08:36.387356800 +0100 -+++ SuiteSparse/RBio/Lib/Makefile 2017-05-01 16:24:28.725356200 +0100 -@@ -60,25 +60,21 @@ - #------------------------------------------------------------------------------- - - # install RBio --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/RBio.h $(INSTALL_INCLUDE) - $(CP) ../README.txt $(INSTALL_DOC)/RBIO_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/RBio.h - chmod 644 $(INSTALL_DOC)/RBIO_README.txt - - # uninstall RBio - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(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-05-01 17:08:36.409357700 +0100 -+++ SuiteSparse/SPQR/Lib/Makefile 2017-05-01 16:24:28.735855300 +0100 -@@ -242,22 +242,20 @@ - #------------------------------------------------------------------------------- - - # install SPQR --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CXX) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/SuiteSparseQR.hpp $(INSTALL_INCLUDE) - $(CP) ../Include/SuiteSparseQR_C.h $(INSTALL_INCLUDE) - $(CP) ../Include/SuiteSparseQR_definitions.h $(INSTALL_INCLUDE) - $(CP) ../Include/spqr.hpp $(INSTALL_INCLUDE) - $(CP) ../Doc/spqr_user_guide.pdf $(INSTALL_DOC) - $(CP) ../README.txt $(INSTALL_DOC)/SPQR_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/SuiteSparseQR.hpp - chmod 644 $(INSTALL_INCLUDE)/SuiteSparseQR_C.h - chmod 644 $(INSTALL_INCLUDE)/SuiteSparseQR_definitions.h -@@ -267,9 +267,7 @@ - - # uninstall SPQR - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/SuiteSparseQR.hpp - $(RM) $(INSTALL_INCLUDE)/SuiteSparseQR_C.h - $(RM) $(INSTALL_INCLUDE)/SuiteSparseQR_definitions.h -diff -urN SuiteSparse.orig/SuiteSparse_config/Makefile SuiteSparse/SuiteSparse_config/Makefile ---- SuiteSparse.orig/SuiteSparse_config/Makefile 2017-05-01 17:08:36.425858700 +0100 -+++ SuiteSparse/SuiteSparse_config/Makefile 2017-05-01 16:24:28.746854300 +0100 -@@ -44,27 +44,22 @@ - - $(RM) -r $(CLEAN) - - # install SuiteSparse_config --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) SuiteSparse_config.h $(INSTALL_INCLUDE) - $(CP) README.txt $(INSTALL_DOC)/SUITESPARSECONFIG_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -- chmod 755 $(INSTALL_LIB)/$(SO_PLAIN) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/SuiteSparse_config.h - chmod 644 $(INSTALL_DOC)/SUITESPARSECONFIG_README.txt - - # uninstall SuiteSparse_config - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/SuiteSparse_config.h - $(RM) $(INSTALL_DOC)/SUITESPARSECONFIG_README.txt - ( cd xerbla ; $(MAKE) uninstall ) -diff -urN SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk.orig SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk ---- SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk.orig 2022-03-15 00:33:19.000000000 +0100 -+++ SuiteSparse-5.11.0/SuiteSparse_config/SuiteSparse_config.mk 2022-03-20 13:25:30.876107144 +0100 -@@ -73,6 +73,7 @@ - # and documentation in /solo/mydox. - INSTALL ?= $(SUITESPARSE) - INSTALL_LIB ?= $(INSTALL)/lib -+ INSTALL_SO ?= $(INSTALL)/lib - INSTALL_INCLUDE ?= $(INSTALL)/include - INSTALL_DOC ?= $(INSTALL)/share/doc/suitesparse-$(SUITESPARSE_VERSION) - -@@ -349,7 +350,7 @@ - ifeq ($(UNAME),Linux) - # add the posix realtime extensions library: librt - LDLIBS += -lrt -- LDFLAGS += -Wl,-rpath=$(INSTALL_LIB) -+ LDFLAGS += -Wl,-rpath=$(INSTALL_SO) - endif - - #--------------------------------------------------------------------------- -@@ -365,7 +366,7 @@ - LAPACK ?= -framework Accelerate - # OpenMP is not yet supported by default in clang - CFOPENMP = -- LDLIBS += -rpath $(INSTALL_LIB) -+ LDLIBS += -rpath $(INSTALL_SO) - endif - - #--------------------------------------------------------------------------- -@@ -446,7 +447,8 @@ - # they aren't actually supported by this OS - SO_MAIN = $(LIBRARY).$(SO_VERSION).dll - SO_PLAIN = $(LIBRARY).$(VERSION).dll -- SO_OPTS += -shared -+ SO_OPTS += -shared -Wl,--out-implib,$(INSTALL_LIB)/$(LIBRARY).dll.a -+ INSTALL_SO = $(INSTALL)/bin - SO_INSTALL_NAME = echo - else - # Mac or Linux/Unix -@@ -568,6 +570,7 @@ - @echo 'System: UNAME= ' '$(UNAME)' - @echo 'Install directory: INSTALL= ' '$(INSTALL)' - @echo 'Install libraries in: INSTALL_LIB= ' '$(INSTALL_LIB)' -+ @echo 'Install shared libs in: INSTALL_SO= ' '$(INSTALL_SO)' - @echo 'Install include files in: INSTALL_INCLUDE=' '$(INSTALL_INCLUDE)' - @echo 'Install documentation in: INSTALL_DOC= ' '$(INSTALL_DOC)' - @echo 'Optimization level: OPTIMIZATION= ' '$(OPTIMIZATION)' -diff -urN SuiteSparse.orig/SuiteSparse_config/xerbla/Makefile SuiteSparse/SuiteSparse_config/xerbla/Makefile ---- SuiteSparse.orig/SuiteSparse_config/xerbla/Makefile 2017-05-01 17:08:36.456857300 +0100 -+++ SuiteSparse/SuiteSparse_config/xerbla/Makefile 2017-05-01 16:24:28.783354600 +0100 -@@ -53,16 +53,13 @@ - $(COMPILE) - $(CC) $(SO_OPTS) xerbla.o -o $@ - - $(RM) xerbla.o -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) xerbla.h $(INSTALL_INCLUDE) -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/xerbla.h - - # uninstall libcerbla / libxerbla - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/xerbla.h - - distclean: purge -diff -urN SuiteSparse.orig/SuiteSparse_GPURuntime/Lib/Makefile SuiteSparse/SuiteSparse_GPURuntime/Lib/Makefile ---- SuiteSparse.orig/SuiteSparse_GPURuntime/Lib/Makefile 2017-05-01 17:08:36.470358000 +0100 -+++ SuiteSparse/SuiteSparse_GPURuntime/Lib/Makefile 2017-05-01 16:24:28.798856500 +0100 -@@ -70,23 +70,19 @@ - #------------------------------------------------------------------------------- - - # install SuiteSparse_GPURuntime (just the library, not the include files) --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJS) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJS) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CXX) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../README.txt $(INSTALL_DOC)/GPURUNTIME_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_DOC)/GPURUNTIME_README.txt - - # uninstall SuiteSparse_GPURuntime - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_DOC)/GPURUNTIME_README.txt - -diff -urN SuiteSparse.orig/UMFPACK/Lib/Makefile SuiteSparse/UMFPACK/Lib/Makefile ---- SuiteSparse.orig/UMFPACK/Lib/Makefile 2017-05-01 17:08:36.484858600 +0100 -+++ SuiteSparse/UMFPACK/Lib/Makefile 2017-05-01 16:24:28.812354100 +0100 -@@ -288,20 +288,18 @@ - - #------------------------------------------------------------------------------- - # install UMFPACK --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/umfpack*.h $(INSTALL_INCLUDE) - $(CP) ../Doc/UMFPACK_UserGuide.pdf $(INSTALL_DOC) - $(CP) ../Doc/UMFPACK_QuickStart.pdf $(INSTALL_DOC) - $(CP) ../README.txt $(INSTALL_DOC)/UMFPACK_README.txt -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/umfpack*.h - chmod 644 $(INSTALL_DOC)/UMFPACK_UserGuide.pdf - chmod 644 $(INSTALL_DOC)/UMFPACK_QuickStart.pdf -@@ -309,9 +309,7 @@ - - # uninstall UMFPACK - uninstall: -- $(RM) $(INSTALL_LIB)/$(SO_TARGET) -- $(RM) $(INSTALL_LIB)/$(SO_PLAIN) -- $(RM) $(INSTALL_LIB)/$(SO_MAIN) -+ $(RM) $(INSTALL_SO)/$(SO_TARGET) - $(RM) $(INSTALL_INCLUDE)/umfpack*.h - $(RM) $(INSTALL_DOC)/UMFPACK_UserGuide.pdf - $(RM) $(INSTALL_DOC)/UMFPACK_QuickStart.pdf - -diff -urN SuiteSparse-5.8.1.orig/SLIP_LU/Lib/Makefile SuiteSparse-5.8.1/SLIP_LU/Lib/Makefile ---- SuiteSparse-5.8.1.orig/SLIP_LU/Lib/Makefile 2020-07-15 04:04:44.000000000 +0500 -+++ SuiteSparse-5.8.1/SLIP_LU/Lib/Makefile 2020-12-22 22:51:56.103420700 +0500 -@@ -63,19 +63,17 @@ - #------------------------------------------------------------------------------- - - # install SLIP_LU --install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET) -+install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) - --$(INSTALL_LIB)/$(SO_TARGET): $(OBJ) -+$(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) - @mkdir -p $(INSTALL_INCLUDE) - @mkdir -p $(INSTALL_DOC) - $(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) ) -- ( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) ) - $(CP) ../Include/SLIP_LU.h $(INSTALL_INCLUDE) - $(CP) ../Doc/SLIP_LU_UserGuide.pdf $(INSTALL_DOC) - $(CP) ../README.md $(INSTALL_DOC)/SLIP_LU_README.md -- chmod 755 $(INSTALL_LIB)/$(SO_TARGET) -+ chmod 755 $(INSTALL_SO)/$(SO_TARGET) - chmod 644 $(INSTALL_INCLUDE)/SLIP_LU.h - chmod 644 $(INSTALL_DOC)/SLIP_LU_UserGuide.pdf - chmod 644 $(INSTALL_DOC)/SLIP_LU_README.md diff --git a/mingw-w64-suitesparse5/0003-mingw-w64-no-CUDA.patch b/mingw-w64-suitesparse5/0003-mingw-w64-no-CUDA.patch deleted file mode 100644 index 57f36e5443..0000000000 --- a/mingw-w64-suitesparse5/0003-mingw-w64-no-CUDA.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config.mk SuiteSparse/SuiteSparse_config/SuiteSparse_config.mk ---- SuiteSparse.orig/SuiteSparse_config/SuiteSparse_config.mk 2017-10-03 20:02:09.070092300 +0800 -+++ SuiteSparse/SuiteSparse_config/SuiteSparse_config.mk 2017-10-03 20:23:32.245485700 +0800 -@@ -194,7 +195,7 @@ - - # CUDA is detected automatically, and used if found. To disable CUDA, - # use CUDA=no -- CUDA = auto -+ CUDA = no - - ifneq ($(CUDA),no) - CUDA_PATH = $(shell which nvcc 2>/dev/null | sed "s/\/bin\/nvcc//") diff --git a/mingw-w64-suitesparse5/0004-mingw-w64-install-static-libs.patch b/mingw-w64-suitesparse5/0004-mingw-w64-install-static-libs.patch deleted file mode 100644 index 1b7ed7197f..0000000000 --- a/mingw-w64-suitesparse5/0004-mingw-w64-install-static-libs.patch +++ /dev/null @@ -1,278 +0,0 @@ -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 -urN SuiteSparse-5.8.1.orig/SLIP_LU/Lib/Makefile SuiteSparse-5.8.1/SLIP_LU/Lib/Makefile ---- SuiteSparse-5.8.1.orig/SLIP_LU/Lib/Makefile 2020-12-22 23:20:55.105328700 +0500 -+++ SuiteSparse-5.8.1/SLIP_LU/Lib/Makefile 2020-12-22 23:21:21.160938900 +0500 -@@ -64,6 +64,7 @@ - - # install SLIP_LU - install: $(AR_TARGET) $(INSTALL_SO)/$(SO_TARGET) -+ $(CP) $(AR_TARGET) $(INSTALL_LIB) - - $(INSTALL_SO)/$(SO_TARGET): $(OBJ) - @mkdir -p $(INSTALL_LIB) diff --git a/mingw-w64-suitesparse5/0005-suitesparse-5.8.1-skip-building-Mongoose-GraphBLAS.patch b/mingw-w64-suitesparse5/0005-suitesparse-5.8.1-skip-building-Mongoose-GraphBLAS.patch deleted file mode 100644 index 055e1fc21b..0000000000 --- a/mingw-w64-suitesparse5/0005-suitesparse-5.8.1-skip-building-Mongoose-GraphBLAS.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -urN SuiteSparse-5.11.0/Makefile.orig SuiteSparse-5.11.0/Makefile ---- SuiteSparse-5.11.0/Makefile.orig 2022-03-15 00:33:19.000000000 +0100 -+++ SuiteSparse-5.11.0/Makefile 2022-03-20 13:51:19.924606309 +0100 -@@ -16,7 +16,7 @@ - # installs all libraries SuiteSparse/lib. - go: metis - ( cd SuiteSparse_config && $(MAKE) ) -- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) -+# ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) - ( cd AMD && $(MAKE) ) - ( cd BTF && $(MAKE) ) - ( cd CAMD && $(MAKE) ) -@@ -34,7 +34,7 @@ - ( cd GPUQREngine && $(MAKE) ) - endif - ( cd SPQR && $(MAKE) ) -- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) -+# ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) - ( cd SLIP_LU && $(MAKE) ) - # ( cd PIRO_BAND && $(MAKE) ) - # ( cd SKYLINE_SVD && $(MAKE) ) -@@ -44,7 +42,7 @@ - # sudo make install INSTALL=/usr/local - # See SuiteSparse/README.md for more details. - # (note that CSparse is not installed; CXSparse is installed instead) --install: metisinstall gbinstall moninstall -+install: metisinstall - ( cd SuiteSparse_config && $(MAKE) install ) - # ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install ) - ( cd AMD && $(MAKE) install ) -@@ -93,8 +89,6 @@ - $(RM) $(INSTALL_DOC)/SuiteSparse_README.md - ( 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 ) -@@ -126,7 +120,7 @@ - # the static library - library: metis - ( cd SuiteSparse_config && $(MAKE) ) -- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) -+# ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) - ( cd AMD && $(MAKE) library ) - ( cd BTF && $(MAKE) library ) - ( cd CAMD && $(MAKE) library ) -@@ -144,7 +137,7 @@ - ( cd GPUQREngine && $(MAKE) library ) - endif - ( cd SPQR && $(MAKE) library ) -- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) -+# ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) - ( cd SLIP_LU && $(MAKE) library ) - # ( cd PIRO_BAND && $(MAKE) library ) - # ( cd SKYLINE_SVD && $(MAKE) library ) -@@ -154,7 +146,7 @@ - # both the dynamic and static libraries. - static: metis - ( cd SuiteSparse_config && $(MAKE) static ) -- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' static ) -+# ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' static ) - ( cd AMD && $(MAKE) static ) - ( cd BTF && $(MAKE) static ) - ( cd CAMD && $(MAKE) static ) -@@ -172,7 +163,7 @@ - ( cd GPUQREngine && $(MAKE) static ) - endif - ( cd SPQR && $(MAKE) static ) -- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' static ) -+# ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' static ) - ( cd SLIP_LU && $(MAKE) static ) - # ( cd PIRO_BAND && $(MAKE) static ) - # ( cd SKYLINE_SVD && $(MAKE) static ) -@@ -233,8 +219,8 @@ - - # Create the PDF documentation - docs: -- ( cd GraphBLAS && $(MAKE) docs ) -- ( cd Mongoose && $(MAKE) docs ) -+# ( cd GraphBLAS && $(MAKE) docs ) -+# ( cd Mongoose && $(MAKE) docs ) - ( cd AMD && $(MAKE) docs ) - ( cd CAMD && $(MAKE) docs ) - ( cd KLU && $(MAKE) docs ) diff --git a/mingw-w64-suitesparse5/0006-suitesparse-5.8.1-fix-mp-link-order.patch b/mingw-w64-suitesparse5/0006-suitesparse-5.8.1-fix-mp-link-order.patch deleted file mode 100644 index 75ab1df89b..0000000000 --- a/mingw-w64-suitesparse5/0006-suitesparse-5.8.1-fix-mp-link-order.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN SuiteSparse-5.8.1.orig/SLIP_LU/Lib/Makefile SuiteSparse-5.8.1/SLIP_LU/Lib/Makefile ---- SuiteSparse-5.8.1.orig/SLIP_LU/Lib/Makefile 2020-07-15 04:04:44.000000000 +0500 -+++ SuiteSparse-5.8.1/SLIP_LU/Lib/Makefile 2020-12-22 19:10:14.936075900 +0500 -@@ -20,7 +20,7 @@ - # CFLAGS += -Wall -Wextra -Wpedantic -Werror - - # SLIP_LU depends on SuiteSparse_config, AMD, COLAMD, M, GMP, and MPFR --LDLIBS += -lsuitesparseconfig -lamd -lcolamd -lm -lgmp -lmpfr -+LDLIBS += -lsuitesparseconfig -lamd -lcolamd -lm -lmpfr -lgmp - - C = $(CC) $(CF) -I../Include -I../../COLAMD/Include -I../../AMD/Include -I../../SuiteSparse_config - diff --git a/mingw-w64-suitesparse5/PKGBUILD b/mingw-w64-suitesparse5/PKGBUILD deleted file mode 100644 index a8543ecc1b..0000000000 --- a/mingw-w64-suitesparse5/PKGBUILD +++ /dev/null @@ -1,112 +0,0 @@ -# Maintainer: Ray Donnelly - -_realname=suitesparse5 -pkgbase=mingw-w64-${_realname} -pkgname=("${MINGW_PACKAGE_PREFIX}-suitesparse5") -pkgver=5.13.0 -pkgrel=1 -pkgdesc='A suite of sparse matrix algorithms (mingw-w64)' -url="https://faculty.cse.tamu.edu/davis/suitesparse.html" -license=('spdx:LGPL-3.0-or-later AND BSD-3-Clause AND LGPL-2.1-or-later AND GPL-2.0-or-later AND LGPL-2.0-or-later AND Apache-2.0 AND GPL-3.0-or-later') -arch=('any') -mingw_arch=('mingw32' 'clang32') -source=(${_realname}-${pkgver}.tar.gz::"https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v${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" - "0004-mingw-w64-install-static-libs.patch" - "0005-suitesparse-5.8.1-skip-building-Mongoose-GraphBLAS.patch" - "0006-suitesparse-5.8.1-fix-mp-link-order.patch") -provides=("${MINGW_PACKAGE_PREFIX}-suitesparse=${pkgver}") -conflicts=("${MINGW_PACKAGE_PREFIX}-suitesparse") -depends=("${MINGW_PACKAGE_PREFIX}-openblas" - "${MINGW_PACKAGE_PREFIX}-omp" - "${MINGW_PACKAGE_PREFIX}-mpfr" - "${MINGW_PACKAGE_PREFIX}-metis") -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" - "${MINGW_PACKAGE_PREFIX}-cc") -noextract=(${_realname}-${pkgver}.tar.gz) -options=('staticlibs') -sha256sums=('59c6ca2959623f0c69226cf9afb9a018d12a37fab3a8869db5f6d7f83b6b147d' - 'fa2ec5c66213c6ab15b68c5a2f846786649db524b050dfafb083a21628f8d348' - '130e0d7261f8f05e23ca92495f4f120182725392297eb6ef10d2d51408a54131' - '8a94c54322323773442c2c60f54795d402d64ac126e2a1a67e48a0075f8571fa' - 'e0faab259d5c474c6af51c9b471f645810a308a1c83976275b1969e81e7d8390' - '8628100f41800e0e4238a8f949fb99e8667e0b58208130606881612d7172835e' - '1cf6cd948e5178cbcb16bb0d3c97829311250dedda1e9dcbe0c85dd6bdc4461e') - -apply_patch_with_msg() { - for _patch in "$@" - do - msg2 "Applying $_patch" - patch -Np1 -i "${srcdir}/$_patch" - done -} - -prepare() { - cd ${srcdir} - rm -rf SuiteSparse-${pkgver} - tar -xzf ${_realname}-${pkgver}.tar.gz || true - - cd "${srcdir}"/SuiteSparse-${pkgver} - - apply_patch_with_msg \ - 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 \ - 0004-mingw-w64-install-static-libs.patch \ - 0005-suitesparse-5.8.1-skip-building-Mongoose-GraphBLAS.patch \ - 0006-suitesparse-5.8.1-fix-mp-link-order.patch -} - -build() { - [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}" - cp -rf "${srcdir}/SuiteSparse-${pkgver}" "${srcdir}/build-${MSYSTEM}" - - cd "${srcdir}/build-${MSYSTEM}" - - # This avoids needing to use a very large patch (we still get diffs but - # that is down to a bug in format string handling somewhere where-by an - # extra 0-padding value is emitted in exponents of scientific floats). - [[ -d "${PWD}/bin" ]] || mkdir "${PWD}/bin" - echo "#!/usr/bin/env bash" > "${PWD}/bin/diff" - echo "/usr/bin/diff --strip-trailing-cr \"\$@\"" >> "${PWD}/bin/diff" - - # This avoids needing to use another very large patch. - [[ -d "${PWD}/lib" ]] || mkdir "${PWD}/lib" - ar cru "${PWD}/lib/librt.a" - - PATH="${PWD}/bin:${PATH}" \ - CC=${CC} \ - CXX=${CXX} \ - CFLAGS="-DLONGBLAS='long long'" \ - CXXFLAGS="-DLONGBLAS='long long'" \ - LDFLAGS="-L${PWD}/lib" \ - MY_METIS_LIB=-lmetis \ - BLAS=-lopenblas \ - LAPACK=-lopenblas \ - CFOPENMP="-fopenmp" \ - MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ - make CMAKE_OPTIONS="-G\"MSYS Makefiles\" -DCMAKE_INSTALL_PREFIX=\"${MINGW_PREFIX}\" -DCMAKE_BUILD_TYPE=Release" -} - -package() { - mkdir -p "${pkgdir}${MINGW_PREFIX}"/{bin,lib,include} || true - - cd "${srcdir}/build-${MSYSTEM}" - - PATH=${PWD}/bin:"${PATH}" \ - CC=${CC} \ - CXX=${CXX} \ - CFLAGS="-DLONGBLAS='long long'" \ - CXXFLAGS="-DLONGBLAS='long long'" \ - MY_METIS_LIB=-lmetis \ - BLAS=-lopenblas \ - LAPACK=-lopenblas \ - CFOPENMP="-fopenmp" \ - MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ - make install \ - INSTALL="${pkgdir}${MINGW_PREFIX}" \ - DESTDIR="${pkgdir}" \ - CMAKE_OPTIONS="-G\"MSYS Makefiles\" -DCMAKE_INSTALL_PREFIX=\"${MINGW_PREFIX}\" -DCMAKE_BUILD_TYPE=Release" -} diff --git a/mingw-w64-superlu/PKGBUILD b/mingw-w64-superlu/PKGBUILD index 6c4a468f91..a9033f2626 100644 --- a/mingw-w64-superlu/PKGBUILD +++ b/mingw-w64-superlu/PKGBUILD @@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=6.0.1 pkgrel=1 arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') pkgdesc="Sparse direct linear solver (mingw-w64)" license=('spdx:BSD-3-Clause') url='https://portal.nersc.gov/project/sparse/superlu/' diff --git a/mingw-w64-superlu_dist/PKGBUILD b/mingw-w64-superlu_dist/PKGBUILD index fa5ecd5da7..f4b995fc15 100644 --- a/mingw-w64-superlu_dist/PKGBUILD +++ b/mingw-w64-superlu_dist/PKGBUILD @@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=8.1.2 pkgrel=1 arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64') pkgdesc="Distributed memory sparse direct linear solver (mingw-w64)" depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-openblas"