diff --git a/mingw-w64-z3/005-fix-clang.patch b/mingw-w64-z3/005-fix-clang.patch new file mode 100644 index 0000000000..f87bf290a5 --- /dev/null +++ b/mingw-w64-z3/005-fix-clang.patch @@ -0,0 +1,11 @@ +--- z3-z3-4.8.9/src/util/hwf.cpp.orig 2021-02-04 20:15:45.155087700 -0800 ++++ z3-z3-4.8.9/src/util/hwf.cpp 2021-02-04 20:16:28.030101000 -0800 +@@ -48,7 +48,7 @@ + // clear to the compiler what instructions should be used. E.g., for sqrt(), the Windows compiler selects + // the x87 FPU, even when /arch:SSE2 is on. + // Luckily, these are kind of standardized, at least for Windows/Linux/macOS. +-#if defined(__clang__) || defined(_M_ARM) && defined(_M_ARM64) ++#if defined(_M_ARM) && defined(_M_ARM64) + #undef USE_INTRINSICS + #endif + diff --git a/mingw-w64-z3/PKGBUILD b/mingw-w64-z3/PKGBUILD index e4dc4de29a..ce3bc76af7 100644 --- a/mingw-w64-z3/PKGBUILD +++ b/mingw-w64-z3/PKGBUILD @@ -4,7 +4,7 @@ _realname=z3 pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=4.8.9 -pkgrel=1 +pkgrel=2 pkgdesc="Z3 is a high-performance theorem prover being developed at Microsoft Research (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64') @@ -16,11 +16,13 @@ options=('strip' 'staticlibs') source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/Z3Prover/z3/archive/z3-${pkgver}.tar.gz" 001-mingw-fixes.patch 003-fix-dll-exports.patch - 004-fix-python-bindings-install.patch) + 004-fix-python-bindings-install.patch + 005-fix-clang.patch) sha256sums=('c9fd04b9b33be74fffaac3ec2bc2c320d1a4cc32e395203c55126b12a14ff3f4' '78554202e1071d5686aed96336ad1020d6249f6d9080c2a7862cb7f72b51379c' 'ce01668afae8e60c32a0d7937d3f8f67a7dc23aa4270913d157e676d061dfe6a' - '7c73e0b6afac99948ca383a709668ae753b8034139332503c8f2d0e310382ac6') + '7c73e0b6afac99948ca383a709668ae753b8034139332503c8f2d0e310382ac6' + '51c2d1071845efbe29e2b38124d7ce7ef210e8441294cd2d53df65348874118a') apply_patch_with_msg() { for _fname in "$@" @@ -35,7 +37,8 @@ prepare() { apply_patch_with_msg \ 001-mingw-fixes.patch \ 003-fix-dll-exports.patch \ - 004-fix-python-bindings-install.patch + 004-fix-python-bindings-install.patch \ + 005-fix-clang.patch } build() {