diff options
-rw-r--r-- | user/z3/APKBUILD | 11 | ||||
-rw-r--r-- | user/z3/_trailing_zeros32.patch | 23 |
2 files changed, 4 insertions, 30 deletions
diff --git a/user/z3/APKBUILD b/user/z3/APKBUILD index 262a7f530..1fadaf24b 100644 --- a/user/z3/APKBUILD +++ b/user/z3/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=z3 -pkgver=4.8.7 -pkgrel=1 +pkgver=4.8.8 +pkgrel=0 pkgdesc="Mathematical theorem prover" url=" " arch="all" @@ -10,9 +10,7 @@ license="MIT" depends="" makedepends="gmp-dev python3-dev cmd:which" subpackages="$pkgname-dev py3-$pkgname:py3:noarch" -source="https://github.com/Z3Prover/z3/archive/z3-$pkgver.tar.gz - _trailing_zeros32.patch - " +source="https://github.com/Z3Prover/z3/archive/z3-$pkgver.tar.gz" builddir="$srcdir/z3-z3-$pkgver" case "$CARCH" in @@ -43,5 +41,4 @@ py3() { mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } -sha512sums="145e2b2f1fa4edd0917107c7e1d54d779c7ed85c48af2ce6def4c90d1c4db05f74c9657e173cedf48770589fbe484c97fa1923295271cd3792523ffc4f67ed0c z3-4.8.7.tar.gz -6cf6ee35b23f9ef9fe879369a1900c82d38836f245e927f0f80eb6361e3340c32c8b94f00b1cb69eb8cad1626675b8f7b9bdaecffa5072cd5e8b12ecf1e7e3c0 _trailing_zeros32.patch" +sha512sums="a6823cadb7cdad11b8f0db1530676c0ec4853886dfb3c4dbc5b798c5dbd445afb0c61675f81cb7f99c1b1734d9cd0ec96a07c68a948da3c25801fc6767fea47f z3-4.8.8.tar.gz" diff --git a/user/z3/_trailing_zeros32.patch b/user/z3/_trailing_zeros32.patch deleted file mode 100644 index 05b977f51..000000000 --- a/user/z3/_trailing_zeros32.patch +++ /dev/null @@ -1,23 +0,0 @@ -From e212159f4e941c78fc03239e0884f2f0454f581f 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 #2727 - -Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> ---- - src/util/mpz.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/util/mpz.cpp b/src/util/mpz.cpp -index a8190df1b0..9c2d3d5ffb 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; |