* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/stp/
@ 2022-08-06 23:53 Maciej Barć
0 siblings, 0 replies; 6+ messages in thread
From: Maciej Barć @ 2022-08-06 23:53 UTC (permalink / raw
To: gentoo-commits
commit: 75cac060d43476807e769eb8f21dfeeb2c54d721
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 6 23:48:15 2022 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sat Aug 6 23:51:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75cac060
sci-mathematics/stp: filter LTO (ODR)
Closes: https://bugs.gentoo.org/863263
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
sci-mathematics/stp/stp-2.3.3-r1.ebuild | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/sci-mathematics/stp/stp-2.3.3-r1.ebuild b/sci-mathematics/stp/stp-2.3.3-r1.ebuild
index 367251ea5f8f..67fbceb1ce9d 100644
--- a/sci-mathematics/stp/stp-2.3.3-r1.ebuild
+++ b/sci-mathematics/stp/stp-2.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,7 +8,7 @@ GT_H=2ad076167a676e3ed62f90b754b30fac5caa1f88
PYTHON_COMPAT=( python3_{8,9,10} )
-inherit python-single-r1 cmake
+inherit flag-o-matic python-single-r1 cmake
DESCRIPTION="Simple Theorem Prover, an efficient SMT solver for bitvectors"
HOMEPAGE="https://stp.github.io/"
@@ -71,12 +71,16 @@ src_prepare() {
}
src_configure() {
+ # -Werror=odr warnings, bug #863263
+ filter-lto
+
local CMAKE_BUILD_TYPE
if use debug ; then
CMAKE_BUILD_TYPE=Debug
else
CMAKE_BUILD_TYPE=Release
fi
+
local mycmakeargs=(
-DNOCRYPTOMINISAT=$(usex cryptominisat 'OFF' 'ON') # double negation
-DENABLE_PYTHON_INTERFACE=$(usex python)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/stp/
@ 2022-08-08 20:46 Maciej Barć
0 siblings, 0 replies; 6+ messages in thread
From: Maciej Barć @ 2022-08-08 20:46 UTC (permalink / raw
To: gentoo-commits
commit: b7c9de657e647f16a7f16c9aae0ba76fb9011312
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 8 20:33:54 2022 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Mon Aug 8 20:45:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7c9de65
sci-mathematics/stp: compile python modules
Closes: https://bugs.gentoo.org/864124
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
sci-mathematics/stp/{stp-2.3.3-r1.ebuild => stp-2.3.3-r2.ebuild} | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/sci-mathematics/stp/stp-2.3.3-r1.ebuild b/sci-mathematics/stp/stp-2.3.3-r2.ebuild
similarity index 89%
rename from sci-mathematics/stp/stp-2.3.3-r1.ebuild
rename to sci-mathematics/stp/stp-2.3.3-r2.ebuild
index 67fbceb1ce9d..e59e4388c2c3 100644
--- a/sci-mathematics/stp/stp-2.3.3-r1.ebuild
+++ b/sci-mathematics/stp/stp-2.3.3-r2.ebuild
@@ -92,7 +92,12 @@ src_configure() {
src_install() {
cmake_src_install
- mv "${D}"/usr/man "${D}"/usr/share/man || die
+ # Because Python files for tests (in BUILD_DIR) and those installed on the
+ # system differ, and are generated upon install, we have to wait for CMake
+ # to install them into the temporary image.
+ use python && python_optimize "${D}/$(python_get_sitedir)"/stp
+
+ mv "${D}"/usr/man "${D}"/usr/share/man || die
dodoc -r papers
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/stp/
@ 2022-11-06 20:11 Maciej Barć
0 siblings, 0 replies; 6+ messages in thread
From: Maciej Barć @ 2022-11-06 20:11 UTC (permalink / raw
To: gentoo-commits
commit: d1f7a354dc856bde7a58abfe3d4c5f2cff71ccfa
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 6 20:09:52 2022 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Nov 6 20:10:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1f7a354
sci-mathematics/stp: do not run C API tests
Closes: https://bugs.gentoo.org/879325
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
sci-mathematics/stp/stp-2.3.3-r2.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sci-mathematics/stp/stp-2.3.3-r2.ebuild b/sci-mathematics/stp/stp-2.3.3-r2.ebuild
index e59e4388c2c3..5f29dc351697 100644
--- a/sci-mathematics/stp/stp-2.3.3-r2.ebuild
+++ b/sci-mathematics/stp/stp-2.3.3-r2.ebuild
@@ -11,7 +11,8 @@ PYTHON_COMPAT=( python3_{8,9,10} )
inherit flag-o-matic python-single-r1 cmake
DESCRIPTION="Simple Theorem Prover, an efficient SMT solver for bitvectors"
-HOMEPAGE="https://stp.github.io/"
+HOMEPAGE="https://stp.github.io/
+ https://github.com/stp/stp/"
SRC_URI="https://github.com/stp/stp/archive/${PV}.tar.gz -> ${P}.tar.gz
test? (
https://github.com/stp/OutputCheck/archive/${OC_H}.tar.gz -> ${P}_OutputCheck.tar.gz
@@ -82,6 +83,7 @@ src_configure() {
fi
local mycmakeargs=(
+ -DTEST_C_API=OFF # C API test fail
-DNOCRYPTOMINISAT=$(usex cryptominisat 'OFF' 'ON') # double negation
-DENABLE_PYTHON_INTERFACE=$(usex python)
-DENABLE_ASSERTIONS=$(usex test)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/stp/
@ 2023-02-21 23:54 Maciej Barć
0 siblings, 0 replies; 6+ messages in thread
From: Maciej Barć @ 2023-02-21 23:54 UTC (permalink / raw
To: gentoo-commits
commit: 335dfafb43cfb8574492617237712bcc324e980c
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 21 22:22:14 2023 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 23:54:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335dfafb
sci-mathematics/stp: update PYTHON_COMPAT; add help2man to BDEPEND
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
.../{stp-2.3.3-r2.ebuild => stp-2.3.3-r3.ebuild} | 28 +++++++++++++---------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/sci-mathematics/stp/stp-2.3.3-r2.ebuild b/sci-mathematics/stp/stp-2.3.3-r3.ebuild
similarity index 81%
rename from sci-mathematics/stp/stp-2.3.3-r2.ebuild
rename to sci-mathematics/stp/stp-2.3.3-r3.ebuild
index 000e5bef36f9..3aa8309bf123 100644
--- a/sci-mathematics/stp/stp-2.3.3-r2.ebuild
+++ b/sci-mathematics/stp/stp-2.3.3-r3.ebuild
@@ -3,21 +3,26 @@
EAPI=8
-OC_H=119fe41a83bc455a24a11ecc9b78e7b13fcfcc45
-GT_H=2ad076167a676e3ed62f90b754b30fac5caa1f88
+OC_COMMIT=119fe41a83bc455a24a11ecc9b78e7b13fcfcc45
+GT_COMMIT=2ad076167a676e3ed62f90b754b30fac5caa1f88
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{10..11} )
inherit flag-o-matic python-single-r1 cmake
DESCRIPTION="Simple Theorem Prover, an efficient SMT solver for bitvectors"
HOMEPAGE="https://stp.github.io/
https://github.com/stp/stp/"
-SRC_URI="https://github.com/stp/stp/archive/${PV}.tar.gz -> ${P}.tar.gz
+SRC_URI="
+ https://github.com/stp/stp/archive/${PV}.tar.gz
+ -> ${P}.tar.gz
test? (
- https://github.com/stp/OutputCheck/archive/${OC_H}.tar.gz -> ${P}_OutputCheck.tar.gz
- https://github.com/stp/googletest/archive/${GT_H}.tar.gz -> ${P}_gtest.tar.gz
- )"
+ https://github.com/stp/OutputCheck/archive/${OC_COMMIT}.tar.gz
+ -> ${P}_OutputCheck.tar.gz
+ https://github.com/stp/googletest/archive/${GT_COMMIT}.tar.gz
+ -> ${P}_gtest.tar.gz
+ )
+"
LICENSE="GPL-2+ MIT"
SLOT="0/${PV}"
@@ -38,7 +43,10 @@ RDEPEND="
python? ( ${PYTHON_DEPS} )
"
DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-python/lit )"
+BDEPEND="
+ sys-apps/help2man
+ test? ( dev-python/lit )
+"
PATCHES=(
"${FILESDIR}"/${P}-CMakeLists.txt-fix_cflags.patch
@@ -46,8 +54,6 @@ PATCHES=(
"${FILESDIR}"/${P}-stp.py-library_path.patch
)
-#include <cstdint>
-
pkg_setup() {
use python && python-single-r1_pkg_setup
}
@@ -85,7 +91,7 @@ src_configure() {
CMAKE_BUILD_TYPE=Release
fi
- local mycmakeargs=(
+ local -a mycmakeargs=(
-DTEST_C_API=OFF # C API test fail
-DNOCRYPTOMINISAT=$(usex cryptominisat 'OFF' 'ON') # double negation
-DENABLE_PYTHON_INTERFACE=$(usex python)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/stp/
@ 2024-04-29 18:57 Maciej Barć
0 siblings, 0 replies; 6+ messages in thread
From: Maciej Barć @ 2024-04-29 18:57 UTC (permalink / raw
To: gentoo-commits
commit: 351b0d97c04df35ea8b9f1e70db4f4295f2b5afc
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 17:08:55 2024 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 18:57:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=351b0d97
sci-mathematics/stp: enable py3.12 compat
Closes: https://bugs.gentoo.org/929798
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
sci-mathematics/stp/stp-2.3.3-r3.ebuild | 44 +++++++++++++++++++--------------
1 file changed, 26 insertions(+), 18 deletions(-)
diff --git a/sci-mathematics/stp/stp-2.3.3-r3.ebuild b/sci-mathematics/stp/stp-2.3.3-r3.ebuild
index 3aa8309bf123..ae62721212d2 100644
--- a/sci-mathematics/stp/stp-2.3.3-r3.ebuild
+++ b/sci-mathematics/stp/stp-2.3.3-r3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-OC_COMMIT=119fe41a83bc455a24a11ecc9b78e7b13fcfcc45
-GT_COMMIT=2ad076167a676e3ed62f90b754b30fac5caa1f88
+OC_COMMIT="119fe41a83bc455a24a11ecc9b78e7b13fcfcc45"
+GT_COMMIT="2ad076167a676e3ed62f90b754b30fac5caa1f88"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit flag-o-matic python-single-r1 cmake
@@ -16,6 +16,7 @@ HOMEPAGE="https://stp.github.io/
SRC_URI="
https://github.com/stp/stp/archive/${PV}.tar.gz
-> ${P}.tar.gz
+
test? (
https://github.com/stp/OutputCheck/archive/${OC_COMMIT}.tar.gz
-> ${P}_OutputCheck.tar.gz
@@ -40,18 +41,24 @@ RDEPEND="
dev-libs/icu:=
sci-mathematics/cryptominisat:=
)
- python? ( ${PYTHON_DEPS} )
+ python? (
+ ${PYTHON_DEPS}
+ )
+"
+DEPEND="
+ ${RDEPEND}
"
-DEPEND="${RDEPEND}"
BDEPEND="
sys-apps/help2man
- test? ( dev-python/lit )
+ test? (
+ dev-python/lit
+ )
"
PATCHES=(
- "${FILESDIR}"/${P}-CMakeLists.txt-fix_cflags.patch
- "${FILESDIR}"/${P}-cstdint.patch
- "${FILESDIR}"/${P}-stp.py-library_path.patch
+ "${FILESDIR}/${P}-CMakeLists.txt-fix_cflags.patch"
+ "${FILESDIR}/${P}-cstdint.patch"
+ "${FILESDIR}/${P}-stp.py-library_path.patch"
)
pkg_setup() {
@@ -59,13 +66,14 @@ pkg_setup() {
}
src_unpack() {
- unpack ${P}.tar.gz
+ unpack "${P}.tar.gz"
if use test ; then
local i
for i in OutputCheck gtest ; do
- tar xf "${DISTDIR}"/${P}_${i}.tar.gz --strip-components=1 \
- -C "${S}"/utils/${i} || die "failed to unpack ${i}"
+ tar xf "${DISTDIR}/${P}_${i}.tar.gz" --strip-components=1 \
+ -C "${S}/utils/${i}" \
+ || die "failed to unpack ${i}"
done
fi
}
@@ -75,7 +83,7 @@ src_prepare() {
sed -i "s/set(LIBDIR lib/set(LIBDIR $(get_libdir)/" CMakeLists.txt || die
# Remove problematic test
- rm "${S}"/tests/query-files/misc-tests/no-query.cvc || die
+ rm "${S}/tests/query-files/misc-tests/no-query.cvc" || die
cmake_src_prepare
}
@@ -86,9 +94,9 @@ src_configure() {
local CMAKE_BUILD_TYPE
if use debug ; then
- CMAKE_BUILD_TYPE=Debug
+ CMAKE_BUILD_TYPE="Debug"
else
- CMAKE_BUILD_TYPE=Release
+ CMAKE_BUILD_TYPE="Release"
fi
local -a mycmakeargs=(
@@ -107,8 +115,8 @@ src_install() {
# Because Python files for tests (in BUILD_DIR) and those installed on the
# system differ, and are generated upon install, we have to wait for CMake
# to install them into the temporary image.
- use python && python_optimize "${D}/$(python_get_sitedir)"/stp
+ use python && python_optimize "${D}/$(python_get_sitedir)/stp"
- mv "${D}"/usr/man "${D}"/usr/share/man || die
+ mv "${D}/usr/man" "${D}/usr/share/man" || die
dodoc -r papers
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/stp/
@ 2024-06-28 23:27 Maciej Barć
0 siblings, 0 replies; 6+ messages in thread
From: Maciej Barć @ 2024-06-28 23:27 UTC (permalink / raw
To: gentoo-commits
commit: 57c9698e1ddecc9a6bd97d304d9da851e4c9d158
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 28 23:26:28 2024 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Fri Jun 28 23:27:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57c9698e
sci-mathematics/stp: build tweaks
Closes: https://bugs.gentoo.org/880135
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
sci-mathematics/stp/stp-2.3.3-r3.ebuild | 8 +++++++-
sci-mathematics/stp/stp-2.3.4.ebuild | 10 +++++++---
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/sci-mathematics/stp/stp-2.3.3-r3.ebuild b/sci-mathematics/stp/stp-2.3.3-r3.ebuild
index ae62721212d2..bd4d40fd22d4 100644
--- a/sci-mathematics/stp/stp-2.3.3-r3.ebuild
+++ b/sci-mathematics/stp/stp-2.3.3-r3.ebuild
@@ -100,12 +100,18 @@ src_configure() {
fi
local -a mycmakeargs=(
- -DTEST_C_API=OFF # C API test fail
-DNOCRYPTOMINISAT=$(usex cryptominisat 'OFF' 'ON') # double negation
-DENABLE_PYTHON_INTERFACE=$(usex python)
-DENABLE_ASSERTIONS=$(usex test)
-DENABLE_TESTING=$(usex test)
)
+
+ if use test ; then
+ mycmakeargs+=(
+ -DTEST_C_API=OFF # C API test fail
+ )
+ fi
+
cmake_src_configure
}
diff --git a/sci-mathematics/stp/stp-2.3.4.ebuild b/sci-mathematics/stp/stp-2.3.4.ebuild
index ab1cbf96c2d2..ab792a8ff3cd 100644
--- a/sci-mathematics/stp/stp-2.3.4.ebuild
+++ b/sci-mathematics/stp/stp-2.3.4.ebuild
@@ -78,9 +78,6 @@ src_configure() {
fi
local -a mycmakeargs=(
- # -DGTEST_PREFIX="${BROOT}/usr/$(get_libdir)/cmake/GTest"
-
- -DTEST_C_API=OFF # C API test fail
-DUSE_RISS=OFF
# Cryptominisat switches
@@ -91,6 +88,13 @@ src_configure() {
-DENABLE_ASSERTIONS=$(usex test)
-DENABLE_TESTING=$(usex test)
)
+
+ if use test ; then
+ mycmakeargs+=(
+ -DTEST_C_API=OFF # C API test fail
+ )
+ fi
+
cmake_src_configure
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-06-28 23:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-06 23:53 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/stp/ Maciej Barć
-- strict thread matches above, loose matches on Subject: below --
2022-08-08 20:46 Maciej Barć
2022-11-06 20:11 Maciej Barć
2023-02-21 23:54 Maciej Barć
2024-04-29 18:57 Maciej Barć
2024-06-28 23:27 Maciej Barć
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox