Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/z3/files/, sci-mathematics/z3/
Date: Tue, 26 Apr 2022 16:04:47
Message-Id: 1650989071.df149f7399efe651296bb014b3ad2d2f063432d0.mgorny@gentoo
1 commit: df149f7399efe651296bb014b3ad2d2f063432d0
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 26 15:24:20 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 26 16:04:31 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df149f73
7
8 sci-mathematics/z3: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sci-mathematics/z3/Manifest | 1 -
13 sci-mathematics/z3/files/z3-4.8.14-libatomic.patch | 60 ------------
14 sci-mathematics/z3/z3-4.8.14-r1.ebuild | 107 ---------------------
15 3 files changed, 168 deletions(-)
16
17 diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
18 index e5a4bbae217e..49d194a31e41 100644
19 --- a/sci-mathematics/z3/Manifest
20 +++ b/sci-mathematics/z3/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST z3-4.8.14.tar.gz 5113598 BLAKE2B c6a82cec33e879123c33506897ac02be682d08a6432da0b11c6918f2664fd7249d8874ccb6f543907f789cc3b40b126465548abeabf4ac16d2ee791ce179742a SHA512 10170516ca472258d2f9df28cd036e43023a76a25f1e1670290c62f3890d935bf82770970054a5fd3a0f02559409e7ed4b18fb08347c040ff2f9e0918e152aab
23 DIST z3-4.8.15.tar.gz 5213633 BLAKE2B 6ca07309370f891f6ca5fa114721cb5df96e726687bf3c2310ba4963b1d1dfeec6ede62fd7a960e17e824ab8ff1e17d2af2a90d8156245ba048b04045c8f0531 SHA512 7b08dec5b035a38edc90c4c491f508fd9ed227357de94400169db53d4c59382bd6a81ae6615771023a06534a3aa92668844f0ebfcc2a3b5ef4bba957426a0c6c
24 DIST z3-4.8.16.tar.gz 5223980 BLAKE2B 67bca86d48df51c9aa4fa3544fd77133c4cc429e6f77f89aa26a559e56e267b8c0891befc6a5e24be541011aac02cb0d51ef26a636c3b360a1fa4d445967da21 SHA512 385f6e1ee075b9eadb5aad338657a81f518eef382b99ce623448a630b79f5d414ebccfd1bb5e959626f0b82ef54a5f20326814ae988b5688d51578de6fb69615
25
26 diff --git a/sci-mathematics/z3/files/z3-4.8.14-libatomic.patch b/sci-mathematics/z3/files/z3-4.8.14-libatomic.patch
27 deleted file mode 100644
28 index 4b7503ef47fd..000000000000
29 --- a/sci-mathematics/z3/files/z3-4.8.14-libatomic.patch
30 +++ /dev/null
31 @@ -1,60 +0,0 @@
32 -https://github.com/Z3Prover/z3/commit/3d87d86c2825437780167ae6ff8f5b203f15ee7f.patch
33 -https://bugs.gentoo.org/835003
34 -
35 -From b2b407cdedc586f8d11f9dd029e1c3016c80bba7 Mon Sep 17 00:00:00 2001
36 -From: Revy <rabenda.cn@×××××.com>
37 -Date: Tue, 15 Mar 2022 02:11:40 +0800
38 -Subject: [PATCH] fix: build on non-x86 platform
39 -
40 -Signed-off-by: Revy <rabenda.cn@×××××.com>
41 ----
42 - CMakeLists.txt | 5 +++++
43 - cmake/check_link_atomic.cmake | 23 +++++++++++++++++++++++
44 - 2 files changed, 28 insertions(+)
45 - create mode 100644 cmake/check_link_atomic.cmake
46 -
47 -diff --git a/CMakeLists.txt b/CMakeLists.txt
48 -index be300607dd..477410ba8d 100644
49 ---- a/CMakeLists.txt
50 -+++ b/CMakeLists.txt
51 -@@ -431,6 +431,11 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
52 - string(APPEND CMAKE_SHARED_LINKER_FLAGS " /RELEASE")
53 - endif()
54 -
55 -+################################################################################
56 -+# Check atomic linking as needed
57 -+################################################################################
58 -+include(${PROJECT_SOURCE_DIR}/cmake/check_link_atomic.cmake)
59 -+
60 - ################################################################################
61 - # Report default CMake flags
62 - ################################################################################
63 -diff --git a/cmake/check_link_atomic.cmake b/cmake/check_link_atomic.cmake
64 -new file mode 100644
65 -index 0000000000..d462191a0b
66 ---- /dev/null
67 -+++ b/cmake/check_link_atomic.cmake
68 -@@ -0,0 +1,23 @@
69 -+set(ATOMIC_TEST_SOURCE "
70 -+#include <atomic>
71 -+std::atomic<int> x;
72 -+std::atomic<short> y;
73 -+std::atomic<char> z;
74 -+std::atomic<long long> w;
75 -+int main() {
76 -+ ++z;
77 -+ ++y;
78 -+ ++w;
79 -+ return ++x;
80 -+}")
81 -+CHECK_CXX_SOURCE_COMPILES("${ATOMIC_TEST_SOURCE}" BUILTIN_ATOMIC)
82 -+if (NOT BUILTIN_ATOMIC)
83 -+ set(CMAKE_REQUIRED_LIBRARIES atomic)
84 -+ CHECK_CXX_SOURCE_COMPILES("${ATOMIC_TEST_SOURCE}" ATOMICS_REQUIRE_LIBATOMIC)
85 -+ unset(CMAKE_REQUIRED_LIBRARIES)
86 -+ if (ATOMICS_REQUIRE_LIBATOMIC)
87 -+ list(APPEND Z3_DEPENDENT_LIBS atomic)
88 -+ else()
89 -+ message(FATAL_ERROR "Host compiler must support std::atomic!")
90 -+ endif()
91 -+endif()
92
93 diff --git a/sci-mathematics/z3/z3-4.8.14-r1.ebuild b/sci-mathematics/z3/z3-4.8.14-r1.ebuild
94 deleted file mode 100644
95 index 9789ce8a98e1..000000000000
96 --- a/sci-mathematics/z3/z3-4.8.14-r1.ebuild
97 +++ /dev/null
98 @@ -1,107 +0,0 @@
99 -# Copyright 1999-2022 Gentoo Authors
100 -# Distributed under the terms of the GNU General Public License v2
101 -
102 -EAPI=7
103 -
104 -CMAKE_ECLASS=cmake
105 -PYTHON_COMPAT=( python3_{8..10} )
106 -
107 -inherit cmake-multilib java-pkg-opt-2 python-single-r1
108 -
109 -DESCRIPTION="An efficient theorem prover"
110 -HOMEPAGE="https://github.com/Z3Prover/z3/"
111 -SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
112 -S=${WORKDIR}/z3-${P}
113 -
114 -SLOT="0/4.8"
115 -LICENSE="MIT"
116 -KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
117 -IUSE="doc examples gmp isabelle java python"
118 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
119 -
120 -RDEPEND="${PYTHON_DEPS}
121 - gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )"
122 -DEPEND="${RDEPEND}
123 - java? ( >=virtual/jdk-1.8 )"
124 -BDEPEND="
125 - doc? ( app-doc/doxygen[dot] )"
126 -
127 -PATCHES=(
128 - "${FILESDIR}/${P}-libatomic.patch" #bug 835003
129 -)
130 -
131 -CMAKE_BUILD_TYPE=RelWithDebInfo
132 -
133 -src_prepare() {
134 - cmake_src_prepare
135 - java-pkg-opt-2_src_prepare
136 -}
137 -
138 -multilib_src_configure() {
139 - local mycmakeargs=(
140 - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
141 - -DZ3_USE_LIB_GMP=$(usex gmp)
142 - -DZ3_ENABLE_EXAMPLE_TARGETS=OFF
143 - -DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
144 - -DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
145 - -DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
146 - -DZ3_INCLUDE_GIT_DESCRIBE=OFF
147 - -DZ3_INCLUDE_GIT_HASH=OFF
148 - )
149 -
150 - multilib_is_native_abi && use java && mycmakeargs+=( -DJAVA_HOME="$(java-config -g JAVA_HOME )" )
151 -
152 - cmake_src_configure
153 -}
154 -
155 -multilib_src_test() {
156 - cmake_build test-z3
157 - set -- "${BUILD_DIR}"/test-z3 /a
158 - echo "${@}" >&2
159 - "${@}" || die
160 -}
161 -
162 -multilib_src_install_all() {
163 - dodoc README.md RELEASE_NOTES
164 - use examples && dodoc -r examples
165 - use python && python_optimize
166 -
167 - if use isabelle; then
168 - insinto /usr/share/Isabelle/contrib/${P}/etc
169 - newins - settings <<-EOF
170 - Z3_COMPONENT="\$COMPONENT"
171 - Z3_HOME="${EPREFIX}/usr/bin"
172 - Z3_SOLVER="${EPREFIX}/usr/bin/z3"
173 - Z3_REMOTE_SOLVER="z3"
174 - Z3_VERSION="${PV}"
175 - Z3_INSTALLED="yes"
176 - Z3_NON_COMMERCIAL="yes"
177 - EOF
178 - fi
179 -}
180 -
181 -pkg_postinst() {
182 - if use isabelle; then
183 - if [[ -f ${ROOT}/etc/isabelle/components ]]; then
184 - sed -e "/contrib\/${PN}-[0-9.]*/d" \
185 - -i "${ROOT}/etc/isabelle/components" || die
186 - cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
187 - contrib/${P}
188 - EOF
189 - fi
190 - fi
191 -}
192 -
193 -pkg_postrm() {
194 - if use isabelle; then
195 - if [[ ! ${REPLACING_VERSIONS} ]]; then
196 - if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
197 - # Note: this sed should only match the version of this ebuild
198 - # Which is what we want as we do not want to remove the line
199 - # of a new Isabelle component being installed during an upgrade.
200 - sed -e "/contrib\/${P}/d" \
201 - -i "${ROOT}/etc/isabelle/components" || die
202 - fi
203 - fi
204 - fi
205 -}