commit 804ec7be6de343fe2f10d89666ff8b73430323e9
Author: Jakub Bogusz <[email protected]>
Date: Mon Dec 20 17:56:44 2021 +0100
- updated to 4.8.13
- removed obsolete ctz patch
z3-ctz.patch | 11 -----------
z3.spec | 17 ++++++++---------
2 files changed, 8 insertions(+), 20 deletions(-)
---
diff --git a/z3.spec b/z3.spec
index c6d238b..2bbdf3c 100644
--- a/z3.spec
+++ b/z3.spec
@@ -13,15 +13,14 @@
Summary: High-performance theorem prover developed at Microsoft Research
Summary(pl.UTF-8): Wydajne narzędzie do dowodzenia twierdzeń tworzone
przez Microsoft Research
Name: z3
-Version: 4.8.7
-Release: 4
+Version: 4.8.13
+Release: 1
License: MIT
Group: Applications/Engineering
#Source0Download: https://github.com/Z3Prover/z3/releases
Source0: https://github.com/Z3Prover/z3/archive/z3-%{version}.tar.gz
-# Source0-md5: 18e7332ab136c1d8686ea719ed7107ed
+# Source0-md5: 723a8859cc9b38b90d127aeca8144dc2
Patch0: %{name}-pld.patch
-Patch1: %{name}-ctz.patch
URL: https://github.com/Z3Prover/z3
BuildRequires: cmake >= 3.4
%{?with_apidocs:BuildRequires: doxygen}
@@ -128,7 +127,6 @@ API języka Python do biblioteki dowodzenia twierdzeń Z3.
%prep
%setup -q -n z3-z3-%{version}
%patch0 -p1
-%patch1 -p1
%build
%if %{with ocaml}
@@ -181,7 +179,7 @@ cd build-cmake
%{__make}
%if %{with ocaml}
-# no cmake suite for ocaml; do it manually (basing on Makefile generated by
mk_make.py)
+# no cmake suite for ocaml; do it manually (basing on Makefile generated by
mk_make.py from `configure --ml`)
install -d src/api/ml
cp -p ../build/api/ml/META src/api/ml
ocamlfind ocamlc -package zarith -ccopt "%{rpmcxxflags} -I../src/api
-I../src/api/ml -o src/api/ml/z3native_stubs.o" -c
../src/api/ml/z3native_stubs.c
@@ -194,12 +192,12 @@ ocamlfind ocamlc -package zarith -I src/api/ml -o
src/api/ml/z3native.cmo -c ../
cp -p ../src/api/ml/z3.mli src/api/ml/z3.mli
ocamlfind ocamlc -package zarith -I src/api/ml -o src/api/ml/z3.cmi -c
src/api/ml/z3.mli
ocamlfind ocamlc -package zarith -I src/api/ml -o src/api/ml/z3.cmo -c
../src/api/ml/z3.ml
-ocamlmklib -o src/api/ml/z3ml -I src/api/ml src/api/ml/z3native_stubs.o
src/api/ml/z3enums.cmo src/api/ml/z3native.cmo src/api/ml/z3.cmo -cclib -lz3
-cclib -fopenmp
+ocamlmklib -o src/api/ml/z3ml -I src/api/ml src/api/ml/z3native_stubs.o
src/api/ml/z3enums.cmo src/api/ml/z3native.cmo src/api/ml/z3.cmo -L. -lz3
-cclib -fopenmp
%if %{with ocaml_opt}
ocamlfind ocamlopt -package zarith -I src/api/ml -o src/api/ml/z3enums.cmx -c
../src/api/ml/z3enums.ml
ocamlfind ocamlopt -package zarith -I src/api/ml -o src/api/ml/z3native.cmx -c
../src/api/ml/z3native.ml
ocamlfind ocamlopt -package zarith -I src/api/ml -o src/api/ml/z3.cmx -c
../src/api/ml/z3.ml
-ocamlmklib -o src/api/ml/z3ml -I src/api/ml src/api/ml/z3native_stubs.o
src/api/ml/z3enums.cmx src/api/ml/z3native.cmx src/api/ml/z3.cmx -cclib -lz3
-cclib -fopenmp
+ocamlmklib -o src/api/ml/z3ml -I src/api/ml src/api/ml/z3native_stubs.o
src/api/ml/z3enums.cmx src/api/ml/z3native.cmx src/api/ml/z3.cmx -L. -lz3
-cclib -fopenmp
ocamlfind ocamlopt -package zarith -linkall -shared -o src/api/ml/z3ml.cmxs -I
. -I src/api/ml src/api/ml/z3ml.cmxa
%endif
%endif
@@ -254,7 +252,8 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libz3.so
-%{_includedir}/%{name}
+%{_includedir}/z3
+%{_pkgconfigdir}/z3.pc
%{_libdir}/cmake/z3
%{_examplesdir}/%{name}-%{version}
diff --git a/z3-ctz.patch b/z3-ctz.patch
deleted file mode 100644
index 704e743..0000000
--- a/z3-ctz.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/804ec7be6de343fe2f10d89666ff8b73430323e9
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
