* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cvc4/files/, sci-mathematics/cvc4/
@ 2021-05-27 16:46 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2021-05-27 16:46 UTC (permalink / raw
To: gentoo-commits
commit: f156562b157e5e59722065a39c5264413fcde2f1
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu May 27 16:45:43 2021 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu May 27 16:45:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f156562b
sci-mathematics/cvc4: version bump to 1.8
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-mathematics/cvc4/Manifest | 1 +
sci-mathematics/cvc4/cvc4-1.8.ebuild | 55 ++++++++++++++++++++++++
sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch | 42 ++++++++++++++++++
3 files changed, 98 insertions(+)
diff --git a/sci-mathematics/cvc4/Manifest b/sci-mathematics/cvc4/Manifest
index bf26cdb9e5e..fe5e434767b 100644
--- a/sci-mathematics/cvc4/Manifest
+++ b/sci-mathematics/cvc4/Manifest
@@ -1 +1,2 @@
DIST cvc4-1.7.tar.gz 6969953 BLAKE2B 3a64db14a734e0314fb7d7b8dbed79e067c9bbf1723343dac1e9c47b3f09811b1a32ff0116412667bd0afefda2489c6c1679bf109710402a67bee0d91b62dd94 SHA512 b91dfac7ddf979a3474f562eb98f2d6f17a53efa38c1be5502429309a0c059e1f2b0d85ee95e5aee17d35f34c825f01f879ec4aaf26025b1fcac835c33a867c6
+DIST cvc4-1.8.tar.gz 7554297 BLAKE2B f4d2b223ba2c01ef745520d8874381a1873358fbc7eca12559656512ffeefccec4eca3d73a26debf34110ca14a3bccf35ca87e2a49575b8b67484bed79df081c SHA512 d6b0153b0f5c4e615c995a8eecfbfd783cfc1004c5134c6880230044081c71d638fee39cceb987eb8d72e91b2b6596b184dc0daacec8880cfc176c6dee8aa445
diff --git a/sci-mathematics/cvc4/cvc4-1.8.ebuild b/sci-mathematics/cvc4/cvc4-1.8.ebuild
new file mode 100644
index 00000000000..347dbda0a24
--- /dev/null
+++ b/sci-mathematics/cvc4/cvc4-1.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR=emake
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit cmake python-any-r1
+
+DESCRIPTION="Automatic theorem prover for satisfiability modulo theories (SMT) problems"
+HOMEPAGE="https://cvc4.github.io/"
+SRC_URI="https://github.com/CVC4/CVC4-archived/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cln proofs readline replay +statistics"
+
+RDEPEND="dev-libs/antlr-c
+ dev-java/antlr:3
+ dev-libs/boost
+ readline? ( sys-libs/readline:0= )
+ cln? ( sci-libs/cln )
+ !cln? ( dev-libs/gmp:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+S="${WORKDIR}"/${PN^^}-archived-${PV}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ -DANTLR_BINARY=/usr/bin/antlr3
+ -DENABLE_GPL=ON
+ -DENABLE_OPTIMIZED=ON
+ -DUSE_CLN="$(usex cln ON OFF)"
+ -DUSE_READLINE="$(usex readline ON OFF)"
+ -DENABLE_STATISTICS="$(usex statistics ON OFF)"
+ -DENABLE_PROOFS="$(usex proofs ON OFF)"
+ -DENABLE_REPLAY="$(usex replay ON OFF)"
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ emake -C "${BUILD_DIR}" \
+ systemtests
+ cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+ mv "${D}"/usr/{lib,$(get_libdir)}
+}
diff --git a/sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch b/sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch
new file mode 100644
index 00000000000..372bea03fb7
--- /dev/null
+++ b/sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch
@@ -0,0 +1,42 @@
+--- a/CMakeLists.txt 2019-07-09 14:47:12.552425226 +0200
++++ b/CMakeLists.txt 2019-07-09 14:50:02.595001358 +0200
+@@ -143,7 +143,7 @@
+
+ # Note: Module CodeCoverage requires the name of the debug build to conform
+ # to cmake standards (first letter uppercase).
+-set(BUILD_TYPES Production Debug Testing Competition)
++set(BUILD_TYPES Production Debug Testing Competition Gentoo)
+
+ if(ENABLE_ASAN)
+ #_cmake_modify_IGNORE set(CMAKE_BUILD_TYPE Debug)
+@@ -166,12 +166,10 @@
+ endif()
+
+ message(STATUS "Building ${CMAKE_BUILD_TYPE} build")
+-include(Config${CMAKE_BUILD_TYPE})
+
+ #-----------------------------------------------------------------------------#
+ # Compiler flags
+
+-add_check_c_cxx_flag("-O${OPTIMIZATION_LEVEL}")
+ add_check_c_cxx_flag("-Wall")
+ add_check_c_flag("-fexceptions")
+ add_check_c_cxx_flag("-Wno-deprecated")
+--- a/test/regress/CMakeLists.txt 2019-07-14 09:49:38.429990489 +0200
++++ b/test/regress/CMakeLists.txt 2019-07-14 09:50:28.854234838 +0200
+@@ -2155,7 +2155,6 @@
+ regress4/C880mul.miter.shuffled-as.sat03-348.smtv1.smt2
+ regress4/NEQ016_size5.smtv1.smt2
+ regress4/bug143.smtv1.smt2
+- regress4/comb2.shuffled-as.sat03-420.smtv1.smt2
+ regress4/hole10.cvc
+ regress4/instance_1151.smtv1.smt2
+ )
+--- a/src/CMakeLists.txt 2019-07-18 08:56:47.923025745 +0200
++++ b/src/CMakeLists.txt 2019-07-18 08:58:10.584750385 +0200
+@@ -915,4 +915,4 @@
+ # Note: This is a temporary fix until the new C++ API is in place.
+ install(CODE "execute_process(COMMAND
+ ${CMAKE_CURRENT_LIST_DIR}/fix-install-headers.sh
+- ${CMAKE_INSTALL_PREFIX})")
++ \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})")
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cvc4/files/, sci-mathematics/cvc4/
@ 2022-11-11 22:34 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2022-11-11 22:34 UTC (permalink / raw
To: gentoo-commits
commit: ebdd2a9c7d597d29d1efa38f8bac6b3e68a8adb7
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 22:34:11 2022 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 22:34:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebdd2a9c
sci-mathematics/cvc4: drop toml usage
Closes: https://bugs.gentoo.org/878679
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
.../{cvc4-1.8-r1.ebuild => cvc4-1.8-r2.ebuild} | 9 +++--
sci-mathematics/cvc4/files/cvc4-1.8-toml.patch | 46 ++++++++++++++++++++++
2 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/sci-mathematics/cvc4/cvc4-1.8-r1.ebuild b/sci-mathematics/cvc4/cvc4-1.8-r2.ebuild
similarity index 87%
rename from sci-mathematics/cvc4/cvc4-1.8-r1.ebuild
rename to sci-mathematics/cvc4/cvc4-1.8-r2.ebuild
index c013d2a2ed33..5757f85d54c2 100644
--- a/sci-mathematics/cvc4/cvc4-1.8-r1.ebuild
+++ b/sci-mathematics/cvc4/cvc4-1.8-r2.ebuild
@@ -24,16 +24,19 @@ RDEPEND="dev-libs/antlr-c
!cln? ( dev-libs/gmp:= )"
DEPEND="${RDEPEND}"
BDEPEND="$(python_gen_any_dep '
- dev-python/toml[${PYTHON_USEDEP}]
+ dev-python/tomli[${PYTHON_USEDEP}]
')
"
S="${WORKDIR}"/${PN^^}-archived-${PV}
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-toml.patch
+)
python_check_deps() {
- python_has_version "dev-python/toml[${PYTHON_USEDEP}]"
+ python_has_version "dev-python/tomli[${PYTHON_USEDEP}]"
}
src_configure() {
diff --git a/sci-mathematics/cvc4/files/cvc4-1.8-toml.patch b/sci-mathematics/cvc4/files/cvc4-1.8-toml.patch
new file mode 100644
index 000000000000..f2ac73bf25c3
--- /dev/null
+++ b/sci-mathematics/cvc4/files/cvc4-1.8-toml.patch
@@ -0,0 +1,46 @@
+--- a/src/options/CMakeLists.txt 2022-11-11 23:12:59.874087267 +0100
++++ b/src/options/CMakeLists.txt 2022-11-11 23:13:11.974894643 +0100
+@@ -1,17 +1,3 @@
+-# Check if the toml Python module is installed.
+-execute_process(
+- COMMAND
+- ${PYTHON_EXECUTABLE} -c "import toml"
+- RESULT_VARIABLE
+- RET_TOML
+- ERROR_QUIET
+-)
+-
+-if(RET_TOML)
+- message(FATAL_ERROR
+- "Could not find Python module toml. Install via `pip install toml'.")
+-endif()
+-
+ libcvc4_add_sources(
+ base_handlers.h
+ decision_weight.h
+--- a/src/options/mkoptions.py 2022-11-11 23:16:22.577858012 +0100
++++ b/src/options/mkoptions.py 2022-11-11 23:23:12.014320054 +0100
+@@ -46,7 +46,11 @@
+ import re
+ import sys
+ import textwrap
+-import toml
++
++if sys.version_info >= (3, 11):
++ import tomllib
++else:
++ import tomli as tomllib
+
+ ### Allowed attributes for module/option/alias
+
+@@ -1309,7 +1313,9 @@
+ # Parse files, check attributes and create module/option objects
+ modules = []
+ for filename in filenames:
+- module = parse_module(filename, toml.load(filename))
++ with open(filename, "rb") as f:
++ d1 = tomllib.load(f)
++ module = parse_module(filename, d1)
+
+ # Check if long options are valid and unique. First populate
+ # g_long_cache with option.long and --no- alternatives if
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cvc4/files/, sci-mathematics/cvc4/
@ 2023-03-05 11:32 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-03-05 11:32 UTC (permalink / raw
To: gentoo-commits
commit: 978a74a61f2ca616c39051f9de4aab1214920bca
Author: Kai-Chun Ning <kaichun.ning <AT> gmail <DOT> com>
AuthorDate: Sun Mar 5 10:53:54 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 5 11:31:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=978a74a6
sci-mathematics/cvc4: fix build with bash 5.2
Closes: https://bugs.gentoo.org/883273
Signed-off-by: Kai-Chun Ning <kaichun.ning <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29933
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{cvc4-1.8-r3.ebuild => cvc4-1.8-r4.ebuild} | 1 +
.../cvc4/files/cvc4-1.8-bash-5.2-fix.patch | 44 ++++++++++++++++++++++
2 files changed, 45 insertions(+)
diff --git a/sci-mathematics/cvc4/cvc4-1.8-r3.ebuild b/sci-mathematics/cvc4/cvc4-1.8-r4.ebuild
similarity index 97%
rename from sci-mathematics/cvc4/cvc4-1.8-r3.ebuild
rename to sci-mathematics/cvc4/cvc4-1.8-r4.ebuild
index 276bdf289c12..d62729a94aa8 100644
--- a/sci-mathematics/cvc4/cvc4-1.8-r3.ebuild
+++ b/sci-mathematics/cvc4/cvc4-1.8-r4.ebuild
@@ -33,6 +33,7 @@ S="${WORKDIR}"/${PN^^}-archived-${PV}
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-toml.patch
+ "${FILESDIR}"/${P}-bash-5.2-fix.patch
)
python_check_deps() {
diff --git a/sci-mathematics/cvc4/files/cvc4-1.8-bash-5.2-fix.patch b/sci-mathematics/cvc4/files/cvc4-1.8-bash-5.2-fix.patch
new file mode 100644
index 000000000000..54398da72555
--- /dev/null
+++ b/sci-mathematics/cvc4/files/cvc4-1.8-bash-5.2-fix.patch
@@ -0,0 +1,44 @@
+Description: Fix FTBFS with bash 5.2
+Author: Jerry James <loganjerry@gmail.com>
+Forwarded: no
+Last-Update: 2022-10-17
+Bug: https://bugs.gentoo.org/883273
+See: https://salsa.debian.org/science-team/cvc4/-/merge_requests/2/diffs?commit_id=05ca9eee24e279ddfbaebea7393b4303200141ad
+---
+
+diff --git a/src/expr/mkexpr b/src/expr/mkexpr
+index c5f12f487..642a7ff0d 100755
+--- a/src/expr/mkexpr
++++ b/src/expr/mkexpr
+@@ -16,6 +16,7 @@
+ #
+
+ copyright=2010-2014
++shopt -u patsub_replacement
+
+ filename=`basename "$1" | sed 's,_template,,'`
+
+diff --git a/src/expr/mkkind b/src/expr/mkkind
+index fbf37eff4..77a8fc7e5 100755
+--- a/src/expr/mkkind
++++ b/src/expr/mkkind
+@@ -15,6 +15,7 @@
+ #
+
+ copyright=2010-2014
++shopt -u patsub_replacement
+
+ filename=`basename "$1" | sed 's,_template,,'`
+
+diff --git a/src/expr/mkmetakind b/src/expr/mkmetakind
+index e2a733ec8..935040bed 100755
+--- a/src/expr/mkmetakind
++++ b/src/expr/mkmetakind
+@@ -18,6 +18,7 @@
+ #
+
+ copyright=2010-2014
++shopt -u patsub_replacement
+
+ cat <<EOF
+ /********************* */
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cvc4/files/, sci-mathematics/cvc4/
@ 2024-05-20 13:04 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2024-05-20 13:04 UTC (permalink / raw
To: gentoo-commits
commit: c11cbec28dbd063e597839ed1603f9bea62d3e73
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon May 20 13:03:04 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon May 20 13:03:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c11cbec2
sci-mathematics/cvc4: fix musl build
Closes: https://bugs.gentoo.org/839402
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-mathematics/cvc4/cvc4-1.8-r5.ebuild | 11 +++-
sci-mathematics/cvc4/files/cvc4-1.8-musl.patch | 80 ++++++++++++++++++++++++++
2 files changed, 89 insertions(+), 2 deletions(-)
diff --git a/sci-mathematics/cvc4/cvc4-1.8-r5.ebuild b/sci-mathematics/cvc4/cvc4-1.8-r5.ebuild
index 6de0fc9372aa..4870f7af7ba6 100644
--- a/sci-mathematics/cvc4/cvc4-1.8-r5.ebuild
+++ b/sci-mathematics/cvc4/cvc4-1.8-r5.ebuild
@@ -11,6 +11,8 @@ DESCRIPTION="Automatic theorem prover for satisfiability modulo theories (SMT) p
HOMEPAGE="https://cvc4.github.io/"
SRC_URI="https://github.com/CVC4/CVC4-archived/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN^^}-archived-${PV}
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
@@ -28,8 +30,6 @@ BDEPEND="$(python_gen_any_dep '
')
"
-S="${WORKDIR}"/${PN^^}-archived-${PV}
-
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
"${FILESDIR}"/${P}-toml.patch
@@ -40,6 +40,13 @@ python_check_deps() {
python_has_version "dev-python/tomli[${PYTHON_USEDEP}]"
}
+src_prepare() {
+ cmake_src_prepare
+ if use elibc_musl ; then
+ eapply "${FILESDIR}"/${P}-musl.patch
+ fi
+}
+
src_configure() {
local mycmakeargs=(
-DANTLR_BINARY=/usr/bin/antlr3
diff --git a/sci-mathematics/cvc4/files/cvc4-1.8-musl.patch b/sci-mathematics/cvc4/files/cvc4-1.8-musl.patch
new file mode 100644
index 000000000000..3448f9bab64f
--- /dev/null
+++ b/sci-mathematics/cvc4/files/cvc4-1.8-musl.patch
@@ -0,0 +1,80 @@
+--- a/src/prop/bvminisat/simp/Main.cc 2024-05-20 14:52:26.827202665 +0200
++++ b/src/prop/bvminisat/simp/Main.cc 2024-05-20 14:53:05.967758613 +0200
+@@ -80,11 +80,6 @@
+ setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n where input may be either in plain or gzipped DIMACS.\n");
+ // printf("This is MiniSat 2.0 beta\n");
+
+-#if defined(__linux__)
+- fpu_control_t oldcw, newcw;
+- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
+- printf("WARNING: for repeatability, setting FPU to use double precision\n");
+-#endif
+ // Extra options:
+ //
+ IntOption verb ("MAIN", "verb", "Verbosity level (0=silent, 1=some, 2=more).", 1, IntRange(0, 2));
+--- a/src/prop/bvminisat/core/Main.cc 2024-05-20 14:52:35.361105845 +0200
++++ b/src/prop/bvminisat/core/Main.cc 2024-05-20 14:53:27.116518689 +0200
+@@ -80,11 +80,6 @@
+ setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n where input may be either in plain or gzipped DIMACS.\n");
+ // printf("This is MiniSat 2.0 beta\n");
+
+-#if defined(__linux__)
+- fpu_control_t oldcw, newcw;
+- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
+- printf("WARNING: for repeatability, setting FPU to use double precision\n");
+-#endif
+ // Extra options:
+ //
+ IntOption verb ("MAIN", "verb", "Verbosity level (0=silent, 1=some, 2=more).", 1, IntRange(0, 2));
+--- a/src/prop/minisat/simp/Main.cc 2024-05-20 14:52:44.044007338 +0200
++++ b/src/prop/minisat/simp/Main.cc 2024-05-20 14:53:39.356379840 +0200
+@@ -81,11 +81,6 @@
+ setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n where input may be either in plain or gzipped DIMACS.\n");
+ // printf("This is MiniSat 2.0 beta\n");
+
+-#if defined(__linux__)
+- fpu_control_t oldcw, newcw;
+- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
+- printf("WARNING: for repeatability, setting FPU to use double precision\n");
+-#endif
+ // Extra options:
+ //
+ IntOption verb ("MAIN", "verb", "Verbosity level (0=silent, 1=some, 2=more).", 1, IntRange(0, 2));
+--- a/src/prop/minisat/core/Main.cc 2024-05-20 14:52:50.063939036 +0200
++++ b/src/prop/minisat/core/Main.cc 2024-05-20 14:53:53.834215599 +0200
+@@ -79,11 +79,6 @@
+ setUsageHelp("USAGE: %s [options] <input-file> <result-output-file>\n\n where input may be either in plain or gzipped DIMACS.\n");
+ // printf("This is MiniSat 2.0 beta\n");
+
+-#if defined(__linux__)
+- fpu_control_t oldcw, newcw;
+- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
+- printf("WARNING: for repeatability, setting FPU to use double precision\n");
+-#endif
+ // Extra options:
+ //
+ IntOption verb ("MAIN", "verb", "Verbosity level (0=silent, 1=some, 2=more).", 1, IntRange(0, 2));
+--- a/src/prop/bvminisat/utils/System.h 2024-05-20 14:54:23.301881326 +0200
++++ b/src/prop/bvminisat/utils/System.h 2024-05-20 14:54:42.030668881 +0200
+@@ -21,9 +21,6 @@
+ #ifndef BVMinisat_System_h
+ #define BVMinisat_System_h
+
+-#if defined(__linux__)
+-#include <fpu_control.h>
+-#endif
+
+ #include "prop/bvminisat/mtl/IntTypes.h"
+
+--- a/src/prop/minisat/utils/System.h 2024-05-20 14:54:28.650820656 +0200
++++ b/src/prop/minisat/utils/System.h 2024-05-20 14:54:55.435516829 +0200
+@@ -21,9 +21,6 @@
+ #ifndef Minisat_System_h
+ #define Minisat_System_h
+
+-#if defined(__linux__)
+-#include <fpu_control.h>
+-#endif
+
+ #include "prop/minisat/mtl/IntTypes.h"
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cvc4/files/, sci-mathematics/cvc4/
@ 2025-04-11 18:30 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2025-04-11 18:30 UTC (permalink / raw
To: gentoo-commits
commit: ed2b5f92f64513fda4dacb3e13d98f18ac9fda13
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 11 18:29:06 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Apr 11 18:29:45 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed2b5f92
sci-mathematics/cvc4: cmake now requires 3.5
Closes: https://bugs.gentoo.org/953543
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-mathematics/cvc4/cvc4-1.8-r5.ebuild | 2 +-
sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/sci-mathematics/cvc4/cvc4-1.8-r5.ebuild b/sci-mathematics/cvc4/cvc4-1.8-r5.ebuild
index e74e6dee4e06..1c55641ca322 100644
--- a/sci-mathematics/cvc4/cvc4-1.8-r5.ebuild
+++ b/sci-mathematics/cvc4/cvc4-1.8-r5.ebuild
@@ -68,7 +68,7 @@ src_configure() {
-e "s|lo = NULL|lo = 0|g" \
-e "s|hi = NULL|hi = 0|g" \
"${BUILD_DIR}"/src/parser/cvc/CvcParser.c \
- die
+ || die
}
src_test() {
diff --git a/sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch b/sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch
index 64cf5bd771b2..d80185457744 100644
--- a/sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch
+++ b/sci-mathematics/cvc4/files/cvc4-1.8-gentoo.patch
@@ -1,5 +1,11 @@
--- a/CMakeLists.txt 2019-07-09 14:47:12.552425226 +0200
+++ b/CMakeLists.txt 2019-07-09 14:50:02.595001358 +0200
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.2)
++cmake_minimum_required(VERSION 3.5)
+
+ #-----------------------------------------------------------------------------#
+ # Project configuration
@@ -83,7 +83,7 @@
#-----------------------------------------------------------------------------#
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-04-11 18:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-11 18:30 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cvc4/files/, sci-mathematics/cvc4/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2024-05-20 13:04 Alfredo Tupone
2023-03-05 11:32 Sam James
2022-11-11 22:34 Alfredo Tupone
2021-05-27 16:46 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox