From 692cf253e44cd03b2dc35e381870c62ae421a572 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 21 Nov 2019 16:12:33 -0700 Subject: [PATCH] Add -trailing-zeros32 patch to fix build failures on some platforms. --- z3-trailing-zeros32.patch | 13 +++++++++++++ z3.spec | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 z3-trailing-zeros32.patch diff --git a/z3-trailing-zeros32.patch b/z3-trailing-zeros32.patch new file mode 100644 index 0000000..0b0fedc --- /dev/null +++ b/z3-trailing-zeros32.patch @@ -0,0 +1,13 @@ +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/z3.spec b/z3.spec index c32b79f..8dd02f3 100644 --- a/z3.spec +++ b/z3.spec @@ -8,9 +8,10 @@ Summary: Satisfiability Modulo Theories (SMT) solver License: MIT URL: https://github.com/Z3Prover/z3 Source0: https://github.com/Z3Prover/z3/archive/%{name}-%{version}.tar.gz - # https://github.com/Z3Prover/z3/pull/2730 Patch0: %{name}-ocamldoc.patch +# https://github.com/Z3Prover/z3/commit/e212159f4e941c78fc03239e0884f2f0454f581f +Patch1: %{name}-trailing-zeros32.patch BuildRequires: doxygen BuildRequires: gcc-c++ @@ -223,6 +224,7 @@ mv %{buildroot}%{_prefix}/lib/lib%{name}java.so %{buildroot}%{_libdir}/%{name} * Thu Nov 21 2019 Jerry James - 4.8.7-1 - New upstream version - Add -ocamldoc patch to fix documentation build failure +- Add -trailing-zeros32 patch to fix build failures on some platforms * Fri Sep 20 2019 Jerry James - 4.8.6-1 - New upstream version