From b2012f65fff88044eec0b17c7679a26aac77e606 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 23 Sep 2022 20:14:32 +0200 Subject: [PATCH] llvm: backport fix for openblas build crash Fixes #13128 --- mingw-w64-clang/PKGBUILD | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/mingw-w64-clang/PKGBUILD b/mingw-w64-clang/PKGBUILD index b6e4bdf072..089dcbc2ab 100644 --- a/mingw-w64-clang/PKGBUILD +++ b/mingw-w64-clang/PKGBUILD @@ -26,7 +26,7 @@ _version=15.0.1 _rc="" _tag=llvmorg-${_version}${_rc} pkgver=${_version}${_rc/-/} -pkgrel=1 +pkgrel=2 pkgdesc="C language family frontend for LLVM (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -70,7 +70,8 @@ source=("${_url}/llvm-${pkgver}.src.tar.xz"{,.sig} "0011-List-memrchr-as-unavailable-on-Windows.patch" "0101-link-pthread-with-mingw.patch" "0102-fix-emulated-tls.patch" - "0303-ignore-new-bfd-options.patch") + "0303-ignore-new-bfd-options.patch" + "https://github.com/llvm/llvm-project/commit/623c4a7a55f7.patch") # Some patch notes :) #0001-0099 -> llvm #0101-0199 -> clang @@ -102,7 +103,8 @@ sha256sums=('0222beed0080fd07f1ee93c5bbeb2e05420b555b9cda725e3a0c299d8cea7cfa' 'cc6aeca56693070de910670f546d2ec50a056d5356540dbd7b5aa74ced45980b' '715cb8862753854b2d9256e0b70003e2d1f57083d83eaeaf5a095fc72b8a4e26' '3a58bd5243fb082df64c90bd9a4f00c698317f20365d11bbe30fac5dfccd215e' - '778e0db0a5b0657ab05e2a81d83241347a4a41af2b0f9903422f651fa58e8d40') + '778e0db0a5b0657ab05e2a81d83241347a4a41af2b0f9903422f651fa58e8d40' + 'e3e6ef4f189b27076cc6209477c1603bcd2301ea49043f33a69d320f744fbf5d') validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D' # Hans Wennborg, Google. '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard 'D574BD5D1D0E98895E3BF90044F2485E45D59042') # Tobias Hieta @@ -155,6 +157,10 @@ prepare() { # https://github.com/msys2/MINGW-packages/issues/13108 apply_patch_with_msg 0010-fix-system-libs-zstd.patch + # Backport to fix a crash when building OpenBLAS + # https://github.com/msys2/MINGW-packages/issues/13128#issuecomment-1256069921 + patch -Nbp2 -i "${srcdir}/623c4a7a55f7.patch" + # Patch clang cd "${srcdir}/clang"