commit: df149f7399efe651296bb014b3ad2d2f063432d0 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Apr 26 15:24:20 2022 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Apr 26 16:04:31 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df149f73
sci-mathematics/z3: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sci-mathematics/z3/Manifest | 1 - sci-mathematics/z3/files/z3-4.8.14-libatomic.patch | 60 ------------ sci-mathematics/z3/z3-4.8.14-r1.ebuild | 107 --------------------- 3 files changed, 168 deletions(-) diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest index e5a4bbae217e..49d194a31e41 100644 --- a/sci-mathematics/z3/Manifest +++ b/sci-mathematics/z3/Manifest @@ -1,3 +1,2 @@ -DIST z3-4.8.14.tar.gz 5113598 BLAKE2B c6a82cec33e879123c33506897ac02be682d08a6432da0b11c6918f2664fd7249d8874ccb6f543907f789cc3b40b126465548abeabf4ac16d2ee791ce179742a SHA512 10170516ca472258d2f9df28cd036e43023a76a25f1e1670290c62f3890d935bf82770970054a5fd3a0f02559409e7ed4b18fb08347c040ff2f9e0918e152aab DIST z3-4.8.15.tar.gz 5213633 BLAKE2B 6ca07309370f891f6ca5fa114721cb5df96e726687bf3c2310ba4963b1d1dfeec6ede62fd7a960e17e824ab8ff1e17d2af2a90d8156245ba048b04045c8f0531 SHA512 7b08dec5b035a38edc90c4c491f508fd9ed227357de94400169db53d4c59382bd6a81ae6615771023a06534a3aa92668844f0ebfcc2a3b5ef4bba957426a0c6c DIST z3-4.8.16.tar.gz 5223980 BLAKE2B 67bca86d48df51c9aa4fa3544fd77133c4cc429e6f77f89aa26a559e56e267b8c0891befc6a5e24be541011aac02cb0d51ef26a636c3b360a1fa4d445967da21 SHA512 385f6e1ee075b9eadb5aad338657a81f518eef382b99ce623448a630b79f5d414ebccfd1bb5e959626f0b82ef54a5f20326814ae988b5688d51578de6fb69615 diff --git a/sci-mathematics/z3/files/z3-4.8.14-libatomic.patch b/sci-mathematics/z3/files/z3-4.8.14-libatomic.patch deleted file mode 100644 index 4b7503ef47fd..000000000000 --- a/sci-mathematics/z3/files/z3-4.8.14-libatomic.patch +++ /dev/null @@ -1,60 +0,0 @@ -https://github.com/Z3Prover/z3/commit/3d87d86c2825437780167ae6ff8f5b203f15ee7f.patch -https://bugs.gentoo.org/835003 - -From b2b407cdedc586f8d11f9dd029e1c3016c80bba7 Mon Sep 17 00:00:00 2001 -From: Revy <[email protected]> -Date: Tue, 15 Mar 2022 02:11:40 +0800 -Subject: [PATCH] fix: build on non-x86 platform - -Signed-off-by: Revy <[email protected]> ---- - CMakeLists.txt | 5 +++++ - cmake/check_link_atomic.cmake | 23 +++++++++++++++++++++++ - 2 files changed, 28 insertions(+) - create mode 100644 cmake/check_link_atomic.cmake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index be300607dd..477410ba8d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -431,6 +431,11 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - string(APPEND CMAKE_SHARED_LINKER_FLAGS " /RELEASE") - endif() - -+################################################################################ -+# Check atomic linking as needed -+################################################################################ -+include(${PROJECT_SOURCE_DIR}/cmake/check_link_atomic.cmake) -+ - ################################################################################ - # Report default CMake flags - ################################################################################ -diff --git a/cmake/check_link_atomic.cmake b/cmake/check_link_atomic.cmake -new file mode 100644 -index 0000000000..d462191a0b ---- /dev/null -+++ b/cmake/check_link_atomic.cmake -@@ -0,0 +1,23 @@ -+set(ATOMIC_TEST_SOURCE " -+#include <atomic> -+std::atomic<int> x; -+std::atomic<short> y; -+std::atomic<char> z; -+std::atomic<long long> w; -+int main() { -+ ++z; -+ ++y; -+ ++w; -+ return ++x; -+}") -+CHECK_CXX_SOURCE_COMPILES("${ATOMIC_TEST_SOURCE}" BUILTIN_ATOMIC) -+if (NOT BUILTIN_ATOMIC) -+ set(CMAKE_REQUIRED_LIBRARIES atomic) -+ CHECK_CXX_SOURCE_COMPILES("${ATOMIC_TEST_SOURCE}" ATOMICS_REQUIRE_LIBATOMIC) -+ unset(CMAKE_REQUIRED_LIBRARIES) -+ if (ATOMICS_REQUIRE_LIBATOMIC) -+ list(APPEND Z3_DEPENDENT_LIBS atomic) -+ else() -+ message(FATAL_ERROR "Host compiler must support std::atomic!") -+ endif() -+endif() diff --git a/sci-mathematics/z3/z3-4.8.14-r1.ebuild b/sci-mathematics/z3/z3-4.8.14-r1.ebuild deleted file mode 100644 index 9789ce8a98e1..000000000000 --- a/sci-mathematics/z3/z3-4.8.14-r1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -PYTHON_COMPAT=( python3_{8..10} ) - -inherit cmake-multilib java-pkg-opt-2 python-single-r1 - -DESCRIPTION="An efficient theorem prover" -HOMEPAGE="https://github.com/Z3Prover/z3/"; -SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"; -S=${WORKDIR}/z3-${P} - -SLOT="0/4.8" -LICENSE="MIT" -KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86" -IUSE="doc examples gmp isabelle java python" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - java? ( >=virtual/jdk-1.8 )" -BDEPEND=" - doc? ( app-doc/doxygen[dot] )" - -PATCHES=( - "${FILESDIR}/${P}-libatomic.patch" #bug 835003 -) - -CMAKE_BUILD_TYPE=RelWithDebInfo - -src_prepare() { - cmake_src_prepare - java-pkg-opt-2_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - -DZ3_USE_LIB_GMP=$(usex gmp) - -DZ3_ENABLE_EXAMPLE_TARGETS=OFF - -DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc) - -DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python) - -DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java) - -DZ3_INCLUDE_GIT_DESCRIBE=OFF - -DZ3_INCLUDE_GIT_HASH=OFF - ) - - multilib_is_native_abi && use java && mycmakeargs+=( -DJAVA_HOME="$(java-config -g JAVA_HOME )" ) - - cmake_src_configure -} - -multilib_src_test() { - cmake_build test-z3 - set -- "${BUILD_DIR}"/test-z3 /a - echo "${@}" >&2 - "${@}" || die -} - -multilib_src_install_all() { - dodoc README.md RELEASE_NOTES - use examples && dodoc -r examples - use python && python_optimize - - if use isabelle; then - insinto /usr/share/Isabelle/contrib/${P}/etc - newins - settings <<-EOF - Z3_COMPONENT="\$COMPONENT" - Z3_HOME="${EPREFIX}/usr/bin" - Z3_SOLVER="${EPREFIX}/usr/bin/z3" - Z3_REMOTE_SOLVER="z3" - Z3_VERSION="${PV}" - Z3_INSTALLED="yes" - Z3_NON_COMMERCIAL="yes" - EOF - fi -} - -pkg_postinst() { - if use isabelle; then - if [[ -f ${ROOT}/etc/isabelle/components ]]; then - sed -e "/contrib\/${PN}-[0-9.]*/d" \ - -i "${ROOT}/etc/isabelle/components" || die - cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die - contrib/${P} - EOF - fi - fi -} - -pkg_postrm() { - if use isabelle; then - if [[ ! ${REPLACING_VERSIONS} ]]; then - if [[ -f "${ROOT}/etc/isabelle/components" ]]; then - # Note: this sed should only match the version of this ebuild - # Which is what we want as we do not want to remove the line - # of a new Isabelle component being installed during an upgrade. - sed -e "/contrib\/${P}/d" \ - -i "${ROOT}/etc/isabelle/components" || die - fi - fi - fi -}
