aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2020-05-09 19:00:06 +0200
committerSören Tempel <soeren+git@soeren-tempel.net>2020-05-09 19:05:13 +0200
commitf43a18cc5b48e78a0b6cdfc33948ba43b1167977 (patch)
tree68869e9238ee83efc544b4eb08cc85b582f2f3a5
parent4664b815b8664b2c531655a6c8355fea31b12599 (diff)
downloadaports-z3-upgrade.tar.bz2
aports-z3-upgrade.tar.xz
community/z3: upgrade to 4.8.8z3-upgrade
-rw-r--r--community/z3/0001-Fix-fail-to-build-on-clang-and-g.patch24
-rw-r--r--community/z3/APKBUILD8
2 files changed, 3 insertions, 29 deletions
diff --git a/community/z3/0001-Fix-fail-to-build-on-clang-and-g.patch b/community/z3/0001-Fix-fail-to-build-on-clang-and-g.patch
deleted file mode 100644
index 8edb6e5f23..0000000000
--- a/community/z3/0001-Fix-fail-to-build-on-clang-and-g.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 37431d6f12ba3c7f8a0f7f7eb21a67579544b1cc Mon Sep 17 00:00:00 2001
-From: Nikolaj Bjorner <nbjorner@microsoft.com>
-Date: Wed, 20 Nov 2019 15:01:04 -0800
-Subject: [PATCH] Fix fail to build on clang++ and g++
-
-Without this patch `src/util/mpz.cpp` fails to build when `__GNUC__` is
-defined.
----
- src/util/mpz.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/util/mpz.cpp b/src/util/mpz.cpp
-index a8190df1b..9c2d3d5ff 100644
---- a/src/util/mpz.cpp
-+++ b/src/util/mpz.cpp
-@@ -72,6 +72,8 @@ inline uint64_t _trailing_zeros64(uint64_t x) {
-
- #if defined(_WINDOWS) && !defined(_M_ARM) && !defined(_M_ARM64)
- // _trailing_zeros32 already defined using intrinsics
-+#elif defined(__GNUC__)
-+// _trailing_zeros32 already defined using intrinsics
- #else
- inline uint32_t _trailing_zeros32(uint32_t x) {
- uint32_t r = 0;
diff --git a/community/z3/APKBUILD b/community/z3/APKBUILD
index 4001dcf791..a6ac15913c 100644
--- a/community/z3/APKBUILD
+++ b/community/z3/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
pkgname=z3
-pkgver=4.8.7
-pkgrel=1
+pkgver=4.8.8
+pkgrel=0
pkgdesc="Theorem prover from Microsoft Research"
url="https://github.com/Z3Prover/z3"
arch="all !s390x !aarch64 !mips !mips64"
@@ -10,7 +10,6 @@ license="MIT"
makedepends="cmake python3"
subpackages="$pkgname-dev py3-$pkgname:py3:noarch"
source="https://github.com/Z3Prover/z3/archive/z3-$pkgver.tar.gz
- 0001-Fix-fail-to-build-on-clang-and-g.patch
none-build-type.patch"
builddir="$srcdir/z3-z3-$pkgver"
@@ -51,6 +50,5 @@ py3() {
"$subpkgdir"/usr/lib/
}
-sha512sums="145e2b2f1fa4edd0917107c7e1d54d779c7ed85c48af2ce6def4c90d1c4db05f74c9657e173cedf48770589fbe484c97fa1923295271cd3792523ffc4f67ed0c z3-4.8.7.tar.gz
-4463b00e84d81447e62f6363163e6a2fa072fe1a1e1bab29c966ae00a222ab1a2e7429b6527bc5d81defb376590dca7bbc06b970fa780d77384011b573ffd7fd 0001-Fix-fail-to-build-on-clang-and-g.patch
+sha512sums="a6823cadb7cdad11b8f0db1530676c0ec4853886dfb3c4dbc5b798c5dbd445afb0c61675f81cb7f99c1b1734d9cd0ec96a07c68a948da3c25801fc6767fea47f z3-4.8.8.tar.gz
9a99777d29558ffcc15fa43e3dc1da46261469c60561c5bc3bcaab40164ed59c45386ed597f27c8160e69acf16d0d8f3ddb06a53b52886ab146d54becc9ccb02 none-build-type.patch"