1 |
commit: d7fe2f7e671ec914e26a6d62800dfc62cda60a22 |
2 |
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 3 19:11:02 2022 +0000 |
4 |
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 3 19:11:41 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7fe2f7e |
7 |
|
8 |
sci-mathematics/cryptominisat: fix sysconfig import |
9 |
|
10 |
Bug: https://github.com/msoos/cryptominisat/pull/679 |
11 |
Closes: https://bugs.gentoo.org/836684 |
12 |
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> |
13 |
|
14 |
.../cryptominisat/cryptominisat-5.8.0.ebuild | 4 +++- |
15 |
...cryptominisat-5.8.0-setup.py.in-sysconfig.patch | 23 ++++++++++++++++++++++ |
16 |
2 files changed, 26 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild b/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild |
19 |
index d4517fca935e..8542bea79b7f 100644 |
20 |
--- a/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild |
21 |
+++ b/sci-mathematics/cryptominisat/cryptominisat-5.8.0.ebuild |
22 |
@@ -1,4 +1,4 @@ |
23 |
-# Copyright 1999-2021 Gentoo Authors |
24 |
+# Copyright 1999-2022 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
EAPI=8 |
28 |
@@ -25,6 +25,8 @@ RDEPEND=" |
29 |
" |
30 |
DEPEND="${RDEPEND}" |
31 |
|
32 |
+PATCHES=( "${FILESDIR}"/${P}-setup.py.in-sysconfig.patch ) |
33 |
+ |
34 |
pkg_setup() { |
35 |
use python && python-single-r1_pkg_setup |
36 |
} |
37 |
|
38 |
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 |
39 |
new file mode 100644 |
40 |
index 000000000000..5280f27bbd8f |
41 |
--- /dev/null |
42 |
+++ b/sci-mathematics/cryptominisat/files/cryptominisat-5.8.0-setup.py.in-sysconfig.patch |
43 |
@@ -0,0 +1,23 @@ |
44 |
+index b3ab64af4..293eb1f80 100644 |
45 |
+--- a/python/setup.py.in |
46 |
++++ b/python/setup.py.in |
47 |
+@@ -27,7 +27,7 @@ import sys |
48 |
+ import os |
49 |
+ import platform |
50 |
+ from distutils.core import setup, Extension |
51 |
+-from distutils import sysconfig |
52 |
++import sysconfig |
53 |
+ from distutils.cmd import Command |
54 |
+ |
55 |
+ __PACKAGE_VERSION__ = "0.2.0" |
56 |
+@@ -59,8 +59,8 @@ def _init_posix(init): |
57 |
+ Forces g++ instead of gcc on most systems |
58 |
+ credits to eric jones (eric@×××××××××.com) (found at Google Groups) |
59 |
+ """ |
60 |
+- def wrapper(): |
61 |
+- init() |
62 |
++ def wrapper(vars): |
63 |
++ init(vars) |
64 |
+ |
65 |
+ config_vars = sysconfig.get_config_vars() # by reference |
66 |
+ if config_vars["MACHDEP"].startswith("sun"): |