diff --git a/mingw-w64-openblas/002-lgfortran-requires-lquadmath.patch b/mingw-w64-openblas/002-lgfortran-requires-lquadmath.patch index 5f3c325cbd189..43ac1536c29f9 100644 --- a/mingw-w64-openblas/002-lgfortran-requires-lquadmath.patch +++ b/mingw-w64-openblas/002-lgfortran-requires-lquadmath.patch @@ -4,8 +4,8 @@ set(FCOMMON_OPT "${FCOMMON_OPT} -fno-optimize-sibling-calls") #Don't include -lgfortran, when NO_LAPACK=1 or lsbcc if (NOT NO_LAPACK) -- set(EXTRALIB "{EXTRALIB} -lgfortran") -+ set(EXTRALIB "{EXTRALIB} -lgfortran -lquadmath") +- set(EXTRALIB "${EXTRALIB} -lgfortran") ++ set(EXTRALIB "${EXTRALIB} -lgfortran -lquadmath") endif () if (NO_BINARY_MODE) if (MIPS64) diff --git a/mingw-w64-openblas/005-fix-pkgconfig-files.patch b/mingw-w64-openblas/005-fix-pkgconfig-files.patch index 2366c9214e0b9..46049d689161c 100644 --- a/mingw-w64-openblas/005-fix-pkgconfig-files.patch +++ b/mingw-w64-openblas/005-fix-pkgconfig-files.patch @@ -8,5 +8,5 @@ -includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ +includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ - openblas_config=USE_64BITINT=@USE_64BITINT@ NO_CBLAS=@NO_CBLAS@ NO_LAPACK=@NO_LAPACK@ NO_LAPACKE=@NO_LAPACKE@ DYNAMIC_ARCH=@DYNAMIC_ARCH@ DYNAMIC_OLDER=@DYNAMIC_OLDER@ NO_AFFINITY=@NO_AFFINITY@ USE_OPENMP=@USE_OPENMP@ @CORE@ MAX_THREADS=@NUM_THREADS@ + openblas_config=USE_64BITINT=@INTERFACE64@ NO_CBLAS=@NO_CBLAS@ NO_LAPACK=@NO_LAPACK@ NO_LAPACKE=@NO_LAPACKE@ DYNAMIC_ARCH=@DYNAMIC_ARCH@ DYNAMIC_OLDER=@DYNAMIC_OLDER@ NO_AFFINITY=@NO_AFFINITY@ USE_OPENMP=@USE_OPENMP@ @CORE@ MAX_THREADS=@NUM_THREADS@ Name: OpenBLAS diff --git a/mingw-w64-openblas/PKGBUILD b/mingw-w64-openblas/PKGBUILD index 584e68bfffd04..6408593d8ea61 100644 --- a/mingw-w64-openblas/PKGBUILD +++ b/mingw-w64-openblas/PKGBUILD @@ -5,8 +5,8 @@ _realname=OpenBLAS pkgbase=mingw-w64-openblas pkgname=("${MINGW_PACKAGE_PREFIX}-openblas" $([[ "${CARCH}" == "i686" ]] || echo "${MINGW_PACKAGE_PREFIX}-openblas64")) -pkgver=0.3.21 -pkgrel=7 +pkgver=0.3.23 +pkgrel=1 pkgdesc="An optimized BLAS library based on GotoBLAS2 1.13 BSD, providing optimized blas, lapack, and cblas (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -20,26 +20,20 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libwinpthread" $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran") "${MINGW_PACKAGE_PREFIX}-omp") -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" +makedepends=("${MINGW_PACKAGE_PREFIX}-cc" + "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" - "${MINGW_PACKAGE_PREFIX}-cc" - $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-fortran") + $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-fc") "dos2unix") options=('!buildflags') source=(https://github.com/xianyi/OpenBLAS/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz - 001-gcc-no-tree-vectorize.patch::https://github.com/xianyi/OpenBLAS/commit/739c3c44a77d87d1b08de59bf868250683c0f755.patch 002-lgfortran-requires-lquadmath.patch 004-aarch64-detection.patch - 005-fix-pkgconfig-files.patch - 006-fix-pointer-mismatch-calling-pow.patch::https://github.com/xianyi/OpenBLAS/commit/515cf269291bec0d43651fe7bf99a71fb074a0ad.patch - 007-fix-missing-return-type.patch::https://github.com/xianyi/OpenBLAS/commit/91110f92d218492d0efbdc1fdf34277ca45f4b36.patch) -sha256sums=('f36ba3d7a60e7c8bcc54cd9aaa9b1223dd42eaf02c811791c37e8ca707c241ca' - 'fb27a983cdaf0e46442bc8b39d4afab4fb6bd61526331841a233a1e588d80e0f' - 'fecd847d029f5fa0d48c685e48e1d5efd413ead14452349fe78a66717fbce3e7' + 005-fix-pkgconfig-files.patch) +sha256sums=('5d9491d07168a5d00116cdc068a40022c3455bf9293c7cb86a65b1054d7e5114' + '465057bcaaaec93d671681f0c5e79b8634bf5c9aca4f495338780ada2dffd49c' '70ce007ff4f6c2a127f9835ce9cd85081707cf3bcccddcfaa06817b06f69c941' - '692131a2784ba8a1855e578fde4799d7bf990b43a620383ded12ed80d47c4a81' - '5f00674fb2ea6208e4712bddcf995232a9eb59a3b76ade7ecfc7579d54779794' - '365e537e31098fb17adc4c89177b03299b12fa88e6ed40fb9c8e6ff83eeee736') + 'bb36b75624fe9768d3d16e9d824e79d4dea5b0f0056601ca4ce37bc93e46f4b5') # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -54,12 +48,9 @@ prepare() { cd "${srcdir}"/${_realname}-${pkgver} apply_patch_with_msg \ - 001-gcc-no-tree-vectorize.patch \ 002-lgfortran-requires-lquadmath.patch \ 004-aarch64-detection.patch \ - 005-fix-pkgconfig-files.patch \ - 006-fix-pointer-mismatch-calling-pow.patch \ - 007-fix-missing-return-type.patch + 005-fix-pkgconfig-files.patch } _build_openblas() { @@ -88,6 +79,11 @@ _build_openblas() { unset CFLAGS unset CXXFLAGS + if [[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]]; then + export CFLAGS=" -Wno-maybe-uninitialized" + else + export CFLAGS=" -Wno-unused-function -Wno-unused-variable" + fi MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \