* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cryptominisat/, sci-mathematics/cryptominisat/files/
@ 2022-04-03 19:11 Maciej Barć
0 siblings, 0 replies; 4+ messages in thread
From: Maciej Barć @ 2022-04-03 19:11 UTC (permalink / raw
To: gentoo-commits
commit: d7fe2f7e671ec914e26a6d62800dfc62cda60a22
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 3 19:11:02 2022 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Apr 3 19:11:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7fe2f7e
sci-mathematics/cryptominisat: fix sysconfig import
Bug: https://github.com/msoos/cryptominisat/pull/679
Closes: https://bugs.gentoo.org/836684
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
.../cryptominisat/cryptominisat-5.8.0.ebuild | 4 +++-
...cryptominisat-5.8.0-setup.py.in-sysconfig.patch | 23 ++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild b/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild
index d4517fca935e..8542bea79b7f 100644
--- a/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild
+++ b/sci-mathematics/cryptominisat/cryptominisat-5.8.0.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
@@ -25,6 +25,8 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-setup.py.in-sysconfig.patch )
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
diff --git a/sci-mathematics/cryptominisat/files/cryptominisat-5.8.0-setup.py.in-sysconfig.patch b/sci-mathematics/cryptominisat/files/cryptominisat-5.8.0-setup.py.in-sysconfig.patch
new file mode 100644
index 000000000000..5280f27bbd8f
--- /dev/null
+++ b/sci-mathematics/cryptominisat/files/cryptominisat-5.8.0-setup.py.in-sysconfig.patch
@@ -0,0 +1,23 @@
+index b3ab64af4..293eb1f80 100644
+--- a/python/setup.py.in
++++ b/python/setup.py.in
+@@ -27,7 +27,7 @@ import sys
+ import os
+ import platform
+ from distutils.core import setup, Extension
+-from distutils import sysconfig
++import sysconfig
+ from distutils.cmd import Command
+
+ __PACKAGE_VERSION__ = "0.2.0"
+@@ -59,8 +59,8 @@ def _init_posix(init):
+ Forces g++ instead of gcc on most systems
+ credits to eric jones (eric@enthought.com) (found at Google Groups)
+ """
+- def wrapper():
+- init()
++ def wrapper(vars):
++ init(vars)
+
+ config_vars = sysconfig.get_config_vars() # by reference
+ if config_vars["MACHDEP"].startswith("sun"):
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cryptominisat/, sci-mathematics/cryptominisat/files/
@ 2023-04-18 13:55 Maciej Barć
0 siblings, 0 replies; 4+ messages in thread
From: Maciej Barć @ 2023-04-18 13:55 UTC (permalink / raw
To: gentoo-commits
commit: 5a968aff45a1fa12c11d60eb6f1be12dd7faa0ed
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 18 12:52:13 2023 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 13:55:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a968aff
sci-mathematics/cryptominisat: drop old 5.8.0
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
sci-mathematics/cryptominisat/Manifest | 1 -
.../cryptominisat/cryptominisat-5.8.0.ebuild | 43 ----------------------
...cryptominisat-5.8.0-setup.py.in-sysconfig.patch | 23 ------------
3 files changed, 67 deletions(-)
diff --git a/sci-mathematics/cryptominisat/Manifest b/sci-mathematics/cryptominisat/Manifest
index ab7269c69b85..eebe71f07e88 100644
--- a/sci-mathematics/cryptominisat/Manifest
+++ b/sci-mathematics/cryptominisat/Manifest
@@ -1,2 +1 @@
DIST cryptominisat-5.11.4.tar.gz 1044845 BLAKE2B b6df4e61c5f37d24a61a5c782f08f223c413e19fc2b1625718f7d19d4df8f4d955a92ae447f6c98889927ddc7407b4790092086996a0a32879c7dcb614ca1024 SHA512 8593848c468a6b1ac3d9ae343384aa323fb6ddc17802c9b184c178b9a41314c463b1c5f02ffd19d6e844894c7998e41d6e9b808ed70dcc235aa595607f52bc76
-DIST cryptominisat-5.8.0.tar.gz 943785 BLAKE2B 534af88a8432c7e3da63989cad8fd5e1491bd69a80b44977fa681e0356e857a505a82dc860b0d04d07987e3edae2861da67ec9dd781261e03a1120dc342b9759 SHA512 3eb954f01524b189a8de57a05f6060471a083addc4b9077c1e32b769d26393ce3d33468819ba8169deedce43fc3663b0ad8bbad95c6afe5e562e438c57b75496
diff --git a/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild b/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild
deleted file mode 100644
index 75dfa7819853..000000000000
--- a/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-
-inherit python-single-r1 cmake
-
-DESCRIPTION="Advanced SAT solver with C++ and Python interfaces"
-HOMEPAGE="https://github.com/msoos/cryptominisat/"
-SRC_URI="https://github.com/msoos/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2 MIT"
-IUSE="+python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test" # tests require many convoluted bundled (git) modules
-
-RDEPEND="
- dev-libs/boost:=
- sys-libs/zlib:=
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-setup.py.in-sysconfig.patch )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DNOBREAKID=ON
- -DNOM4RI=ON
- -DENABLE_PYTHON_INTERFACE=$(usex python)
- -DFORCE_PYTHON3=$(usex python)
- -DENABLE_TESTING=OFF
- )
- cmake_src_configure
-}
diff --git a/sci-mathematics/cryptominisat/files/cryptominisat-5.8.0-setup.py.in-sysconfig.patch b/sci-mathematics/cryptominisat/files/cryptominisat-5.8.0-setup.py.in-sysconfig.patch
deleted file mode 100644
index 5280f27bbd8f..000000000000
--- a/sci-mathematics/cryptominisat/files/cryptominisat-5.8.0-setup.py.in-sysconfig.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-index b3ab64af4..293eb1f80 100644
---- a/python/setup.py.in
-+++ b/python/setup.py.in
-@@ -27,7 +27,7 @@ import sys
- import os
- import platform
- from distutils.core import setup, Extension
--from distutils import sysconfig
-+import sysconfig
- from distutils.cmd import Command
-
- __PACKAGE_VERSION__ = "0.2.0"
-@@ -59,8 +59,8 @@ def _init_posix(init):
- Forces g++ instead of gcc on most systems
- credits to eric jones (eric@enthought.com) (found at Google Groups)
- """
-- def wrapper():
-- init()
-+ def wrapper(vars):
-+ init(vars)
-
- config_vars = sysconfig.get_config_vars() # by reference
- if config_vars["MACHDEP"].startswith("sun"):
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cryptominisat/, sci-mathematics/cryptominisat/files/
@ 2023-04-18 13:55 Maciej Barć
0 siblings, 0 replies; 4+ messages in thread
From: Maciej Barć @ 2023-04-18 13:55 UTC (permalink / raw
To: gentoo-commits
commit: adc145bc60a27b69c8d00f1eb7e44f33cd57be44
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 18 12:59:27 2023 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 13:55:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adc145bc
sci-mathematics/cryptominisat: fix build with GCC 13
Closes: https://bugs.gentoo.org/895116
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
sci-mathematics/cryptominisat/cryptominisat-5.11.4.ebuild | 2 ++
.../cryptominisat/files/cryptominisat-5.11.4-gcc-13.patch | 11 +++++++++++
2 files changed, 13 insertions(+)
diff --git a/sci-mathematics/cryptominisat/cryptominisat-5.11.4.ebuild b/sci-mathematics/cryptominisat/cryptominisat-5.11.4.ebuild
index a4f699cc2afd..6ff76af75ca2 100644
--- a/sci-mathematics/cryptominisat/cryptominisat-5.11.4.ebuild
+++ b/sci-mathematics/cryptominisat/cryptominisat-5.11.4.ebuild
@@ -21,6 +21,8 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}"/${PN}-5.11.4-gcc-13.patch )
+
src_configure() {
local -a mycmakeargs=(
-DNOBREAKID=ON
diff --git a/sci-mathematics/cryptominisat/files/cryptominisat-5.11.4-gcc-13.patch b/sci-mathematics/cryptominisat/files/cryptominisat-5.11.4-gcc-13.patch
new file mode 100644
index 000000000000..e9c7fade75fe
--- /dev/null
+++ b/sci-mathematics/cryptominisat/files/cryptominisat-5.11.4-gcc-13.patch
@@ -0,0 +1,11 @@
+index 0cf7910..54cb45e 100644
+--- a/src/ccnr.h
++++ b/src/ccnr.h
+@@ -23,6 +23,7 @@ THE SOFTWARE.
+ #ifndef CCNR_H
+ #define CCNR_H
+
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ #include "ccnr_mersenne.h"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cryptominisat/, sci-mathematics/cryptominisat/files/
@ 2024-06-12 23:40 Maciej Barć
0 siblings, 0 replies; 4+ messages in thread
From: Maciej Barć @ 2024-06-12 23:40 UTC (permalink / raw
To: gentoo-commits
commit: 292ba8f849c4bfff03e68225287e22cea8f621a5
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 22:45:25 2024 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 23:40:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=292ba8f8
sci-mathematics/cryptominisat: patch unistd include
Closes: https://bugs.gentoo.org/895118
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
sci-mathematics/cryptominisat/cryptominisat-5.11.21.ebuild | 4 ++++
.../cryptominisat/files/cryptominisat-5.11.21-unistd.patch | 12 ++++++++++++
2 files changed, 16 insertions(+)
diff --git a/sci-mathematics/cryptominisat/cryptominisat-5.11.21.ebuild b/sci-mathematics/cryptominisat/cryptominisat-5.11.21.ebuild
index 4beb16299f8c..7de12b4067d1 100644
--- a/sci-mathematics/cryptominisat/cryptominisat-5.11.21.ebuild
+++ b/sci-mathematics/cryptominisat/cryptominisat-5.11.21.ebuild
@@ -31,6 +31,10 @@ DEPEND="
${RDEPEND}
"
+PATCHES=(
+ "${FILESDIR}/${PN}-5.11.21-unistd.patch"
+)
+
src_configure() {
local -a mycmakeargs=(
-DNOBREAKID=ON
diff --git a/sci-mathematics/cryptominisat/files/cryptominisat-5.11.21-unistd.patch b/sci-mathematics/cryptominisat/files/cryptominisat-5.11.21-unistd.patch
new file mode 100644
index 000000000000..c64228a17862
--- /dev/null
+++ b/sci-mathematics/cryptominisat/files/cryptominisat-5.11.21-unistd.patch
@@ -0,0 +1,12 @@
+index f0a9e33..85286be 100644
+--- a/src/picosat/picosat.c
++++ b/src/picosat/picosat.c
+@@ -8148,7 +8148,7 @@ picosat_stats (PS * ps)
+ #else
+ #include <sys/time.h>
+ #include <sys/resource.h>
+-#include <sys/unistd.h>
++#include <unistd.h>
+ #endif
+
+ double
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-06-12 23:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-18 13:55 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cryptominisat/, sci-mathematics/cryptominisat/files/ Maciej Barć
-- strict thread matches above, loose matches on Subject: below --
2024-06-12 23:40 Maciej Barć
2023-04-18 13:55 Maciej Barć
2022-04-03 19:11 Maciej Barć
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox