* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/z3/files/, sci-mathematics/z3/
@ 2022-04-26 16:04 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2022-04-26 16:04 UTC (permalink / raw
To: gentoo-commits
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 <rabenda.cn@gmail.com>
-Date: Tue, 15 Mar 2022 02:11:40 +0800
-Subject: [PATCH] fix: build on non-x86 platform
-
-Signed-off-by: Revy <rabenda.cn@gmail.com>
----
- 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/z3/files/, sci-mathematics/z3/
@ 2023-12-21 10:47 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2023-12-21 10:47 UTC (permalink / raw
To: gentoo-commits
commit: d613e1c4dfeb3e1afdb462400b50ee086a04d6af
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 10:44:47 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 10:47:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d613e1c4
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.12.2-gcc-13.patch | 12 ---
sci-mathematics/z3/z3-4.12.2.ebuild | 112 ------------------------
3 files changed, 125 deletions(-)
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 4747641ffda5..dd7b34d080d2 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,3 +1,2 @@
-DIST z3-4.12.2.tar.gz 5401038 BLAKE2B e83bc4067360888da1be20dffbbd4b060118080e1f8a1b0424c169ad1aaaccf5ab645960418db7ce544829c7831da90edb0e38003d7a0261df699c9bd69ab1f0 SHA512 375477cbbc9837b44e752c89916409d07bf6a73830b52878aab4f376f08b37dd5ab485da225744d394ab15f2a7e1014edc3be5eb9962934c440a8d55259317e2
DIST z3-4.12.3.tar.gz 5471745 BLAKE2B ce14a13a0af651b414cd164658b5953d5ea398201fc299e5073690caa9625b23ffbdce33a2f220f1420570b1b21ace6be48486c2c333251325b7acb5ca6e0d43 SHA512 06d667b86e2d941e8cbcafe508392f5ef9307354a97428107e26ac7ef86246a86a0096fbf92034f2a3e47efe41f95ddc74460c2c4797aadec79e14020737afcb
DIST z3-4.12.4.tar.gz 5471960 BLAKE2B 9c8a65a6632e673e9c7da2ee0e8c8f7d145b906a1c6bdd6df9826fabc31e1c773d3512317ae6278b8a5cb40c580eaff98c37512fb2a2ad17c1c5ada90e0f8026 SHA512 fcb778d2e3e0d13fc68afcd8724548279f9edbbb4aac1bbb93e00959c33330ab2fd84f2c2e4b0b78f767819725a90b845fc606a9adc931ae1f0a11f4deae433b
diff --git a/sci-mathematics/z3/files/z3-4.12.2-gcc-13.patch b/sci-mathematics/z3/files/z3-4.12.2-gcc-13.patch
deleted file mode 100644
index 74f8abed1e3b..000000000000
--- a/sci-mathematics/z3/files/z3-4.12.2-gcc-13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/util/tptr.h b/src/util/tptr.h
-index 6213b2efa40..2a35af5353d 100644
---- a/src/util/tptr.h
-+++ b/src/util/tptr.h
-@@ -20,6 +20,7 @@ Revision History:
- #pragma once
-
- #include "util/machine.h"
-+#include <cstdint>
-
- #define TAG_SHIFT PTR_ALIGNMENT
- #define ALIGNMENT_VALUE (1 << PTR_ALIGNMENT)
diff --git a/sci-mathematics/z3/z3-4.12.2.ebuild b/sci-mathematics/z3/z3-4.12.2.ebuild
deleted file mode 100644
index 8be932dc18ab..000000000000
--- a/sci-mathematics/z3/z3-4.12.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-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/$(ver_cut 1-2)"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv sparc 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] )
-"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-PATCHES=(
- # https://github.com/Z3Prover/z3/commit/520e692a43c41e8981eb091494bef0297ecbe3c6
- "${FILESDIR}/${P}-gcc-13.patch"
-)
-
-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
- 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/z3/files/, sci-mathematics/z3/
@ 2023-11-06 11:54 Andrew Ammerlaan
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2023-11-06 11:54 UTC (permalink / raw
To: gentoo-commits
commit: b8f53371b9ad8919b2b78d2abf7b713a214726b3
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 6 11:53:59 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Nov 6 11:54:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f53371
sci-mathematics/z3: add 4.12.2
Closes: https://bugs.gentoo.org/916710
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-mathematics/z3/Manifest | 1 +
sci-mathematics/z3/files/z3-4.12.2-gcc-13.patch | 12 +++
sci-mathematics/z3/z3-4.12.2.ebuild | 112 ++++++++++++++++++++++++
3 files changed, 125 insertions(+)
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 1a076bbe3a11..6092b10eed66 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1 +1,2 @@
DIST z3-4.12.1.tar.gz 5470095 BLAKE2B 8840b2c3bea5ae409f52bd2db931f7c0d88f86e154c2bf7d1bed34a0c7b72a5596a20467259f37ad9cae3c7e24d2e04ddebe8dd539a2e1a1ed6445d59b6cef28 SHA512 031fba9cc000a8da0025f95fa3f1c7519071d1b7775b377ff3192c505bb4c7e3d267da246c9ae68c940224e055a3c30571d2c0d7fbb042ec9a3d5849543a385c
+DIST z3-4.12.2.tar.gz 5401038 BLAKE2B e83bc4067360888da1be20dffbbd4b060118080e1f8a1b0424c169ad1aaaccf5ab645960418db7ce544829c7831da90edb0e38003d7a0261df699c9bd69ab1f0 SHA512 375477cbbc9837b44e752c89916409d07bf6a73830b52878aab4f376f08b37dd5ab485da225744d394ab15f2a7e1014edc3be5eb9962934c440a8d55259317e2
diff --git a/sci-mathematics/z3/files/z3-4.12.2-gcc-13.patch b/sci-mathematics/z3/files/z3-4.12.2-gcc-13.patch
new file mode 100644
index 000000000000..74f8abed1e3b
--- /dev/null
+++ b/sci-mathematics/z3/files/z3-4.12.2-gcc-13.patch
@@ -0,0 +1,12 @@
+diff --git a/src/util/tptr.h b/src/util/tptr.h
+index 6213b2efa40..2a35af5353d 100644
+--- a/src/util/tptr.h
++++ b/src/util/tptr.h
+@@ -20,6 +20,7 @@ Revision History:
+ #pragma once
+
+ #include "util/machine.h"
++#include <cstdint>
+
+ #define TAG_SHIFT PTR_ALIGNMENT
+ #define ALIGNMENT_VALUE (1 << PTR_ALIGNMENT)
diff --git a/sci-mathematics/z3/z3-4.12.2.ebuild b/sci-mathematics/z3/z3-4.12.2.ebuild
new file mode 100644
index 000000000000..d1cb32391790
--- /dev/null
+++ b/sci-mathematics/z3/z3-4.12.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+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/$(ver_cut 1-2)"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~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] )
+"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+PATCHES=(
+ # https://github.com/Z3Prover/z3/commit/520e692a43c41e8981eb091494bef0297ecbe3c6
+ "${FILESDIR}/${P}-gcc-13.patch"
+)
+
+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
+ 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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/z3/files/, sci-mathematics/z3/
@ 2019-04-10 15:07 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2019-04-10 15:07 UTC (permalink / raw
To: gentoo-commits
commit: 6785f3b5e8a6e7969ed07ed59c5b2e7a82aea188
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 10 14:34:28 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 10 15:07:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6785f3b5
sci-mathematics/z3: Drop old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-mathematics/z3/Manifest | 1 -
sci-mathematics/z3/files/z3-4.4.1-gcc-6.patch | 18 ---
sci-mathematics/z3/z3-4.4.1.ebuild | 178 --------------------------
3 files changed, 197 deletions(-)
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 8fa3186e1cc..6ef6cbd0cc1 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,3 +1,2 @@
-DIST z3-4.4.1.tar.gz 3347371 BLAKE2B 57f090b891618613c4647a89620d12f2ac05ea110268e63b343594f53fa2cc7aa347781001e2778ea7dc1ce475c964ddeced7a82c304b4be706ad164fd17a285 SHA512 76991a24f47f2b53ceb8d7a9a6be19913c57994ffb6cf6acfe30f61b2e73959cf02a99f656053594fccb5aaf4d1f44b3ae7e51f1c8953b213d738ceeeaea74f8
DIST z3-4.5.0.tar.gz 3573695 BLAKE2B 285cc4d1f998d61ddb0b854044b7c79c1bb4cccf51bbdcba7c4a45698d74d9591f84d0aa74c5ef7c8aea2c6539ac987f29e326b44037e954108df67644dff594 SHA512 1ebc2c908d90b6b879f1e819c864ff894613276af47a440f27cf94968c195656952434754c3eb20f4bdbdd8497d227d22e1b4821c0d320b11052b5648d9e2dc7
DIST z3-4.8.4.tar.gz 4117081 BLAKE2B 6912defbae0e5444c451c4d7c6fb5d51167a1ae166257c7bfc53044ce7e9b9c4bd9824986c2ae1e6abfd6fef495234c9bea60078f8db2c1faaae11f34d666831 SHA512 4660ba6ab33a6345b2e8396c332d4afcfc73eda66ceb2595a39f152df4d62a9ea0f349b0f9212389ba84ecba6bdae6ad9b62b376ba44dc4d9c74f80d7a818bf4
diff --git a/sci-mathematics/z3/files/z3-4.4.1-gcc-6.patch b/sci-mathematics/z3/files/z3-4.4.1-gcc-6.patch
deleted file mode 100644
index 2dc0ddd12f2..00000000000
--- a/sci-mathematics/z3/files/z3-4.4.1-gcc-6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/util/debug.cpp b/src/util/debug.cpp
-index 54c67fe..66676c6 100644
---- a/src/util/debug.cpp
-+++ b/src/util/debug.cpp
-@@ -78,3 +78,3 @@ void invoke_gdb() {
- char result;
-- bool ok = (std::cin >> result);
-+ bool ok = bool(std::cin >> result);
- if (!ok) exit(ERR_INTERNAL_FATAL); // happens if std::cin is eof or unattached.
-diff --git a/src/util/mpz.cpp b/src/util/mpz.cpp
-index 8559279..7dca14b 100644
---- a/src/util/mpz.cpp
-+++ b/src/util/mpz.cpp
-@@ -136,3 +136,3 @@ mpz_manager<SYNCH>::mpz_manager():
- mpz one(1);
-- set(m_two64, UINT64_MAX);
-+ set(m_two64, (uint64)UINT64_MAX);
- add(m_two64, one, m_two64);
diff --git a/sci-mathematics/z3/z3-4.4.1.ebuild b/sci-mathematics/z3/z3-4.4.1.ebuild
deleted file mode 100644
index 8fd027f17fe..00000000000
--- a/sci-mathematics/z3/z3-4.4.1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic java-pkg-2 java-pkg-simple python-r1 toolchain-funcs
-
-DESCRIPTION="An efficient theorem prover"
-HOMEPAGE="http://z3.codeplex.com/"
-SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gmp isabelle java python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- gmp? ( dev-libs/gmp:0 )"
-DEPEND="${RDEPEND}
- java? ( >=virtual/jdk-1.8 )"
-
-S=${WORKDIR}/${PN}-${P}
-JAVA_SRC_DIR=${S}/src/api/java
-
-SO1="0"
-SO2="1"
-SOVER="${SO1}.${SO2}"
-
-pkg_setup() {
- python_setup
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- if [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp; then
- ewarn "Please use an openmp compatible compiler"
- ewarn "like >gcc-4.2 with USE=openmp"
- die "Openmp support missing in compiler"
- fi
- fi
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/${P}-gcc-6.patch
- default
-
- sed \
- -e 's:-O3::g' \
- -e 's:-fomit-frame-pointer::' \
- -e 's:-msse2::g' \
- -e 's:-msse::g' \
- -e "/LINK_EXTRA_FLAGS/s:@LDFLAGS@:-lrt $(usex gmp -lgmp ""):g" \
- -e 's:t@\$:t\$:g' \
- -i scripts/*mk* || die
-
- sed \
- -e "s:SLIBEXTRAFLAGS = '':SLIBEXTRAFLAGS = '-Wl,-soname,lib${PN}.so.${SOVER}':" \
- -i scripts/mk_util.py || die
-
- append-ldflags -fopenmp
-
- cat <<- EOF > "${S}/src/api/python/__init__.py" || die
- from .z3 import *
-
- from . import z3num
- from . import z3poly
- from . import z3printer
- from . import z3rcf
- from . import z3types
- from . import z3util
-
- # generated files
- from . import z3core
- from . import z3consts
- EOF
-}
-
-src_configure() {
- export Z3_INSTALL_LIB_DIR="$(get_libdir)"
- export Z3_INSTALL_INCLUDE_DIR="include/z3"
- set -- \
- $(usex gmp --gmp "") \
- $(usex java --java "")
- echo ./configure "$@" >&2
- ./configure "$@" || die
- ${EPYTHON} scripts/mk_make.py || die
-}
-
-src_compile() {
- emake \
- --directory="build" \
- CXX=$(tc-getCXX) \
- LINK="$(tc-getCXX) ${LDFLAGS}" \
- LINK_FLAGS="${LDFLAGS}"
-
- use java && java-pkg-simple_src_compile
-}
-
-src_install() {
- dodir /usr/include/${PN}
- insinto /usr/include/${PN}
- doins src/api/z3*.h src/api/c++/z3*.h
- dolib.so build/lib${PN}.so
- dosym "/usr/$(get_libdir)/lib${PN}.so" \
- "/usr/$(get_libdir)/lib${PN}.so.${SO1}" \
- || die "Could not create /usr/$(get_libdir)/lib${PN}.so.${SO1} symlink"
- dosym "/usr/$(get_libdir)/lib${PN}.so" \
- "/usr/$(get_libdir)/lib${PN}.so.${SOVER}" \
- || die "Could not create libz3.so soname symlink"
- dobin build/z3
-
- if use examples; then
- insinto /usr/share/${PN}
- doins -r examples
- fi
-
- if use python; then
- python_moduleinto "${PN}"
- instpybind() {
- python_domodule src/api/python/*.py
- dosym "/usr/$(get_libdir)/lib${PN}.so" \
- "$(python_get_sitedir)/${PN}/lib${PN}.so" \
- || die "Could not create $(python_get_sitedir)/lib${PN}.so symlink for python module"
- }
- python_foreach_impl instpybind
- fi
-
- use java && java-pkg-simple_src_install
-
- if use isabelle; then
- ISABELLE_HOME="${ROOT}usr/share/Isabelle"
- dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
- cat <<- EOF >> "${S}/settings" || die
- Z3_COMPONENT="\$COMPONENT"
- Z3_HOME="${ROOT}usr/bin"
- Z3_SOLVER="${ROOT}usr/bin/z3"
- Z3_REMOTE_SOLVER="z3"
- Z3_VERSION="${PV}"
- Z3_INSTALLED="yes"
- Z3_NON_COMMERCIAL="yes"
- EOF
- insinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
- doins "${S}/settings"
- fi
-
- local DOCS=( "README" "RELEASE_NOTES" )
- use doc && einstalldocs
-}
-
-pkg_postinst() {
- if use isabelle; then
- if [ -f "${ROOT}etc/isabelle/components" ]; then
- if egrep "contrib/${PN}-[0-9.]*" "${ROOT}etc/isabelle/components"; then
- sed -e "/contrib\/${PN}-[0-9.]*/d" \
- -i "${ROOT}etc/isabelle/components"
- fi
- cat <<- EOF >> "${ROOT}etc/isabelle/components"
- contrib/${PN}-${PV}
- EOF
- fi
- fi
-}
-
-pkg_postrm() {
- if use isabelle; then
- if [ ! -f "${ROOT}usr/bin/Z3" ]; 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\/${PN}-${PV}/d" \
- -i "${ROOT}etc/isabelle/components"
- fi
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-12-21 10:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-26 16:04 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/z3/files/, sci-mathematics/z3/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-12-21 10:47 Michał Górny
2023-11-06 11:54 Andrew Ammerlaan
2019-04-10 15:07 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox