public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/z3] rawhide: OCaml 5.5.0 rebuild
@ 2026-07-09 18:05 Jerry James
0 siblings, 0 replies; only message in thread
From: Jerry James @ 2026-07-09 18:05 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/z3
Branch : rawhide
Commit : 81f8e8f923c5906a5dc61fbd7c0483848d9735e0
Author : Jerry James <loganjerry@gmail.com>
Date : 2026-07-09T12:05:02-06:00
Stats : +16/-23 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/z3/c/81f8e8f923c5906a5dc61fbd7c0483848d9735e0?branch=rawhide
Log:
OCaml 5.5.0 rebuild
- Use the cmake declarative buildsystem
---
diff --git a/z3.spec b/z3.spec
index f014748..da82c1f 100644
--- a/z3.spec
+++ b/z3.spec
@@ -33,8 +33,19 @@ Patch: %{name}-s390x-doc.patch
# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
+BuildSystem: cmake
+BuildOption(conf): -G Ninja
+BuildOption(conf): -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/z3
+BuildOption(conf): -DZ3_BUILD_DOCUMENTATION:BOOL=ON
+%ifarch %{java_arches}
+BuildOption(conf): -DZ3_BUILD_JAVA_BINDINGS:BOOL=ON
+%endif
+BuildOption(conf): -DZ3_BUILD_PYTHON_BINDINGS:BOOL=ON
+BuildOption(conf): -DCMAKE_INSTALL_PYTHON_PKG_DIR=%{python3_sitelib}
+BuildOption(conf): -DZ3_INCLUDE_GIT_HASH:BOOL=OFF
+BuildOption(conf): -DZ3_INCLUDE_GIT_DESCRIBE:BOOL=OFF
+BuildOption(conf): -DZ3_USE_LIB_GMP:BOOL=ON
-BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: gcc-c++
BuildRequires: gmp-devel
@@ -48,7 +59,6 @@ BuildRequires: make
BuildRequires: ninja-build
BuildRequires: ocaml
BuildRequires: ocaml-findlib
-BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-zarith-devel
BuildRequires: python3-devel
BuildRequires: %{py3_dist setuptools}
@@ -140,7 +150,6 @@ Python 3 interface to z3.
%patch 0 -p1
%endif
-%conf
# Enable verbose builds, use Fedora CFLAGS, preserve timestamps when installing,
# include the entire contents of the archives in the library, link the library
# with the correct flags, and build the ocaml files with debuginfo.
@@ -162,23 +171,10 @@ sed -e '/libz3java/s,\(System\.load\)Library("\(.*\)"),\1("%{_libdir}/z3/\2.so")
# Turn off HTML timestamps for reproducible builds
sed -i '/HTML_TIMESTAMP/s/YES/NO/' doc/z3api.cfg.in doc/z3code.dox
-%build
+%build -p
export PYTHON=%{python3}
-%cmake -G Ninja \
- -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/z3 \
- -DZ3_BUILD_DOCUMENTATION:BOOL=ON \
-%ifarch %{java_arches}
- -DZ3_BUILD_JAVA_BINDINGS:BOOL=ON \
-%endif
- -DZ3_BUILD_PYTHON_BINDINGS:BOOL=ON \
- -DCMAKE_INSTALL_PYTHON_PKG_DIR=%{python3_sitelib} \
- -DZ3_INCLUDE_GIT_HASH:BOOL=OFF \
- -DZ3_INCLUDE_GIT_DESCRIBE:BOOL=OFF \
- -DZ3_USE_LIB_GMP:BOOL=ON
-
-%cmake_build
-
+%build -a
# Remove meaningless memory addresses from the pydoc documentation
# See https://github.com/python/cpython/issues/83572
sed -ri 's/, handle [0-9a-fA-F]+//' \
@@ -209,10 +205,7 @@ sed -i '/^api/s/ libz3\$(SO_EXT)//g' build/Makefile
# Fourth, build the OCaml interface
%make_build -C build ml
-%install
-# Install the C++, python3, and Java interfaces
-%cmake_install
-
+%install -a
%ifarch %{java_arches}
# Move the Java interface to its correct location
mkdir -p %{buildroot}%{_libdir}/z3
@@ -244,8 +237,8 @@ help2man -N -o %{buildroot}%{_mandir}/man1/z3.1 \
# Fix the pkgconfig file
sed -i 's,//usr,,' %{buildroot}%{_libdir}/pkgconfig/z3.pc
-%if %{with test}
%check
+%if %{with test}
cd build
make test-z3
./test-z3 /a
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-09 18:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-09 18:05 [rpms/z3] rawhide: OCaml 5.5.0 rebuild Jerry James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox