From 6280e8cc16f2ebbbec47fa4b648dd7a7397f285a Mon Sep 17 00:00:00 2001 From: Hernan Martinez Date: Thu, 28 Jul 2022 10:37:42 -0600 Subject: [PATCH] Fix detection logic for CLANGARM64 --- mingw-w64-suitesparse/PKGBUILD | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mingw-w64-suitesparse/PKGBUILD b/mingw-w64-suitesparse/PKGBUILD index 93f3a97668..d238123be9 100644 --- a/mingw-w64-suitesparse/PKGBUILD +++ b/mingw-w64-suitesparse/PKGBUILD @@ -4,12 +4,12 @@ _realname=suitesparse pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-suitesparse") pkgver=5.12.0 -pkgrel=1 +pkgrel=2 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' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') 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" @@ -32,6 +32,7 @@ sha256sums=('5fb0064a3398111976f30c5908a8c0b40df44c6dd8f0cc4bfa7b9e45d8c647de' 'e0faab259d5c474c6af51c9b471f645810a308a1c83976275b1969e81e7d8390' '8628100f41800e0e4238a8f949fb99e8667e0b58208130606881612d7172835e' '1cf6cd948e5178cbcb16bb0d3c97829311250dedda1e9dcbe0c85dd6bdc4461e') +_openmp_flag=$([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* || ${MINGW_PACKAGE_PREFIX} != *-clang-*86* ]] || echo "-fopenmp") apply_patch_with_msg() { for _patch in "$@" @@ -83,6 +84,7 @@ build() { MY_METIS_LIB=-lmetis \ BLAS=-lopenblas \ LAPACK=-lopenblas \ + CFOPENMP=${_openmp_flag} \ MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ make CMAKE_OPTIONS="-G\"MSYS Makefiles\" -DCMAKE_INSTALL_PREFIX=\"${MINGW_PREFIX}\" -DCMAKE_BUILD_TYPE=Release" } @@ -100,6 +102,7 @@ package() { MY_METIS_LIB=-lmetis \ BLAS=-lopenblas \ LAPACK=-lopenblas \ + CFOPENMP=${_openmp_flag} \ MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ make install \ INSTALL="${pkgdir}${MINGW_PREFIX}" \