From 58643c4d8cc41113c0cce242ddd249743d3540e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=BCtzel?= Date: Wed, 1 Jun 2022 20:18:18 +0200 Subject: [PATCH] python-cvxopt: link against OpenBLAS also in CLANG* environments --- mingw-w64-python-cvxopt/PKGBUILD | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/mingw-w64-python-cvxopt/PKGBUILD b/mingw-w64-python-cvxopt/PKGBUILD index 41704a7071..cacae56d1b 100644 --- a/mingw-w64-python-cvxopt/PKGBUILD +++ b/mingw-w64-python-cvxopt/PKGBUILD @@ -7,18 +7,16 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Convex optimization based on the Python programming language (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') url='https://cvxopt.org/' -license=('GPL v3') +license=('spdx:GPL-3.0-or-later') validpgpkeys=('gpg_KEY') makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools" "${MINGW_PACKAGE_PREFIX}-cc") depends=("${MINGW_PACKAGE_PREFIX}-python" - $([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] && - echo "${MINGW_PACKAGE_PREFIX}-openblas" || - echo "${MINGW_PACKAGE_PREFIX}-f2cblaslapack") + "${MINGW_PACKAGE_PREFIX}-openblas" "${MINGW_PACKAGE_PREFIX}-suitesparse" "${MINGW_PACKAGE_PREFIX}-gsl" "${MINGW_PACKAGE_PREFIX}-fftw" @@ -30,14 +28,15 @@ sha256sums=('7aac94a116b7142a5f362e567c4b6c3b7c67b04b4a6a2a3c3b90b4c9f0ac74e1') prepare() { cd "${srcdir}" + [[ -d "python-build-${MSYSTEM}" ]] && rm -rf "python-build-${MSYSTEM}" cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" } build() { cd "${srcdir}/python-build-${MSYSTEM}" - CVXOPT_BLAS_LIB=$([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] && echo 'openblas' || echo 'blas') \ - CVXOPT_LAPACK_LIB=$([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] && echo 'openblas' || echo 'lapack') \ + CVXOPT_BLAS_LIB='openblas' \ + CVXOPT_LAPACK_LIB='openblas' \ CVXOPT_BUILD_GSL=1 \ CVXOPT_BUILD_FFTW=1 \ CVXOPT_BUILD_DSDP=1 \