| 1 |
commit: a65ec6d62c8bc1c85685e0c1dd0eda12134b177f |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 26 08:16:59 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 26 08:17:03 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a65ec6d6 |
| 7 |
|
| 8 |
sci-libs/scipy: Backport fix for glibc-2.22 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.23 |
| 11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/scipy-0.16.1-glibc-2.22-backport.patch | 30 ++++++++++++++++++++++ |
| 14 |
sci-libs/scipy/scipy-0.16.1.ebuild | 1 + |
| 15 |
2 files changed, 31 insertions(+) |
| 16 |
|
| 17 |
diff --git a/sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch b/sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..791d67f |
| 20 |
--- /dev/null |
| 21 |
+++ b/sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch |
| 22 |
@@ -0,0 +1,30 @@ |
| 23 |
+From 1f5ccd5447ed2796bb8e9506cfbfdb4a82cccfc0 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Ralf Gommers <ralf.gommers@×××××.com> |
| 25 |
+Date: Sat, 24 Oct 2015 18:17:04 +0200 |
| 26 |
+Subject: [PATCH] TST: fix issue with a ctypes test for integrate on Fedora. |
| 27 |
+ Closes gh-5370 |
| 28 |
+ |
| 29 |
+--- |
| 30 |
+ scipy/integrate/tests/test_quadpack.py | 9 ++++++++- |
| 31 |
+ 1 file changed, 8 insertions(+), 1 deletion(-) |
| 32 |
+ |
| 33 |
+diff --git a/scipy/integrate/tests/test_quadpack.py b/scipy/integrate/tests/test_quadpack.py |
| 34 |
+index c3a417c..f384c77 100644 |
| 35 |
+--- a/scipy/integrate/tests/test_quadpack.py |
| 36 |
++++ b/scipy/integrate/tests/test_quadpack.py |
| 37 |
+@@ -42,7 +42,14 @@ def setUp(self): |
| 38 |
+ file = 'libm.dylib' |
| 39 |
+ else: |
| 40 |
+ file = 'libm.so' |
| 41 |
+- self.lib = ctypes.CDLL(file) |
| 42 |
++ |
| 43 |
++ try: |
| 44 |
++ self.lib = ctypes.CDLL(file) |
| 45 |
++ except OSError: |
| 46 |
++ # This test doesn't work on some Linux platforms (Fedora for |
| 47 |
++ # example) that put an ld script in libm.so - see gh-5370 |
| 48 |
++ self.skipTest("Ctypes can't import libm.so") |
| 49 |
++ |
| 50 |
+ restype = ctypes.c_double |
| 51 |
+ argtypes = (ctypes.c_double,) |
| 52 |
+ for name in ['sin', 'cos', 'tan']: |
| 53 |
|
| 54 |
diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild b/sci-libs/scipy/scipy-0.16.1.ebuild |
| 55 |
index 33610d6..de2289b 100644 |
| 56 |
--- a/sci-libs/scipy/scipy-0.16.1.ebuild |
| 57 |
+++ b/sci-libs/scipy/scipy-0.16.1.ebuild |
| 58 |
@@ -102,6 +102,7 @@ python_prepare_all() { |
| 59 |
local PATCHES=( |
| 60 |
"${FILESDIR}"/${PN}-0.12.0-blitz.patch |
| 61 |
"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch |
| 62 |
+ "${FILESDIR}"/${P}-glibc-2.22-backport.patch |
| 63 |
) |
| 64 |
distutils-r1_python_prepare_all |
| 65 |
} |
Archives