[packages/z3] - updated cmake options - added ctz patch (adjust __builtin_ctz conditions for gcc)

[qboosh]

commit 0bc82cec4442a9701e0247c36b4adbb3546330d8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Dec 28 17:52:50 2019 +0100

    - updated cmake options
    - added ctz patch (adjust __builtin_ctz conditions for gcc)

 z3-ctz.patch | 11 +++++++++++
 z3.spec      | 13 +++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/z3.spec b/z3.spec
index 32a388b..7688dc0 100644
--- a/z3.spec
+++ b/z3.spec
@@ -21,6 +21,7 @@ Group:		Applications/Engineering
 Source0:	https://github.com/Z3Prover/z3/archive/z3-%{version}.tar.gz
 # Source0-md5:	18e7332ab136c1d8686ea719ed7107ed
 Patch0:		%{name}-pld.patch
+Patch1:		%{name}-ctz.patch
 URL:		https://github.com/Z3Prover/z3
 BuildRequires:	cmake >= 3.4
 %{?with_apidocs:BuildRequires:	doxygen}
@@ -129,6 +130,7 @@ API języka Python do biblioteki dowodzenia twierdzeń Z3.
 %prep
 %setup -q -n z3-z3-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %if %{with ocaml}
@@ -168,16 +170,15 @@ cd build-cmake
 %cmake .. \
 	-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/z3 \
 	-DCMAKE_INSTALL_PYTHON_PKG_DIR=%{py_sitescriptdir} \
-	%{?with_dotnet:-DINSTALL_DOTNET_BINDINGS=ON} \
-	-DINSTALL_JAVA_BINDINGS=ON \
-	-DINSTALL_PYTHON_BINDINGS=ON \
-	-DUSE_LIB_GMP=ON \
-	-DUSE_OPENMP=ON \
 	%{?with_apidocs:-DZ3_BUILD_DOCUMENTATION=ON} \
 	%{?with_dotnet:-DZ3_BUILD_DOTNET_BINDINGS=ON} \
 	-DZ3_BUILD_JAVA_BINDINGS=ON \
 	-DZ3_BUILD_LIBZ3_SHARED=ON \
-	-DZ3_BUILD_PYTHON_BINDINGS=ON
+	-DZ3_BUILD_PYTHON_BINDINGS=ON \
+	%{?with_dotnet:-DZ3_INSTALL_DOTNET_BINDINGS=ON} \
+	-DZ3_INSTALL_JAVA_BINDINGS=ON \
+	-DZ3_INSTALL_PYTHON_BINDINGS=ON \
+	-DZ3_USE_LIB_GMP=ON
 
 %{__make}
 
diff --git a/z3-ctz.patch b/z3-ctz.patch
new file mode 100644
index 0000000..704e743
--- /dev/null
+++ b/z3-ctz.patch
@@ -0,0 +1,11 @@
+--- z3-z3-4.8.7/src/util/mpz.cpp.orig	2019-11-19 21:58:44.000000000 +0100
++++ z3-z3-4.8.7/src/util/mpz.cpp	2019-12-28 17:15:25.216519693 +0100
+@@ -70,7 +70,7 @@
+     return r;
+ }
+ 
+-#if defined(_WINDOWS) && !defined(_M_ARM) && !defined(_M_ARM64)
++#if (defined(_WINDOWS) || defined(__GNUC__)) && !defined(_M_ARM) && !defined(_M_ARM64)
+ // _trailing_zeros32 already defined using intrinsics
+ #else
+ inline uint32_t _trailing_zeros32(uint32_t x) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/z3.git/commitdiff/0bc82cec4442a9701e0247c36b4adbb3546330d8