summaryrefslogtreecommitdiff
path: root/sci-libs/scipy/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
commit4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
treeba5f07bf3f9d22d82e54a462313f5d244036c768 /sci-libs/scipy/files
reinit the tree, so we can have metadata
Diffstat (limited to 'sci-libs/scipy/files')
-rw-r--r--sci-libs/scipy/files/scipy-0.12.0-blitz.patch28
-rw-r--r--sci-libs/scipy/files/scipy-0.12.0-restore-sys-argv.patch15
-rw-r--r--sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch30
3 files changed, 73 insertions, 0 deletions
diff --git a/sci-libs/scipy/files/scipy-0.12.0-blitz.patch b/sci-libs/scipy/files/scipy-0.12.0-blitz.patch
new file mode 100644
index 000000000000..2817aa39b871
--- /dev/null
+++ b/sci-libs/scipy/files/scipy-0.12.0-blitz.patch
@@ -0,0 +1,28 @@
+Description: Fixes scipy.weave.inline compalition with g++ 4.3 and upwards
+Author: Sameer Morar <smorar@gmail.com>
+Forwarded: http://projects.scipy.org/scipy/scipy/ticket/739
+Bug-Debian: http://bugs.debian.org/598520
+Bug-Ubuntu: https://launchpad.net/bugs/302649
+
+--- a/scipy/weave/blitz/blitz/blitz.h
++++ b/scipy/weave/blitz/blitz/blitz.h
+@@ -65,6 +65,8 @@
+
+ #define BZ_THROW // Needed in <blitz/numinquire.h>
+
++#include <cstdlib>
++
+ BZ_NAMESPACE(blitz)
+
+ #ifdef BZ_HAVE_STD
+--- a/scipy/weave/blitz/blitz/prettyprint.h
++++ b/scipy/weave/blitz/blitz/prettyprint.h
+@@ -22,6 +22,8 @@
+ #ifndef BZ_PRETTYPRINT_H
+ #define BZ_PRETTYPRINT_H
+
++#include <cstdlib>
++
+ BZ_NAMESPACE(blitz)
+
+ class prettyPrintFormat {
diff --git a/sci-libs/scipy/files/scipy-0.12.0-restore-sys-argv.patch b/sci-libs/scipy/files/scipy-0.12.0-restore-sys-argv.patch
new file mode 100644
index 000000000000..3eef739f93a8
--- /dev/null
+++ b/sci-libs/scipy/files/scipy-0.12.0-restore-sys-argv.patch
@@ -0,0 +1,15 @@
+Description: restore sys.argv in case of exception
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=500814
+
+--- a/scipy/weave/build_tools.py
++++ b/scipy/weave/build_tools.py
+@@ -283,6 +283,9 @@ def build_extension(module_path,compiler
+ configure_python_path(build_dir)
+ except SyntaxError: #TypeError:
+ success = 0
++ except Exception, e:
++ restore_sys_argv()
++ raise e
+
+ # restore argv after our trick...
+ restore_sys_argv()
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
new file mode 100644
index 000000000000..791d67f32531
--- /dev/null
+++ b/sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch
@@ -0,0 +1,30 @@
+From 1f5ccd5447ed2796bb8e9506cfbfdb4a82cccfc0 Mon Sep 17 00:00:00 2001
+From: Ralf Gommers <ralf.gommers@gmail.com>
+Date: Sat, 24 Oct 2015 18:17:04 +0200
+Subject: [PATCH] TST: fix issue with a ctypes test for integrate on Fedora.
+ Closes gh-5370
+
+---
+ scipy/integrate/tests/test_quadpack.py | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/scipy/integrate/tests/test_quadpack.py b/scipy/integrate/tests/test_quadpack.py
+index c3a417c..f384c77 100644
+--- a/scipy/integrate/tests/test_quadpack.py
++++ b/scipy/integrate/tests/test_quadpack.py
+@@ -42,7 +42,14 @@ def setUp(self):
+ file = 'libm.dylib'
+ else:
+ file = 'libm.so'
+- self.lib = ctypes.CDLL(file)
++
++ try:
++ self.lib = ctypes.CDLL(file)
++ except OSError:
++ # This test doesn't work on some Linux platforms (Fedora for
++ # example) that put an ld script in libm.so - see gh-5370
++ self.skipTest("Ctypes can't import libm.so")
++
+ restype = ctypes.c_double
+ argtypes = (ctypes.c_double,)
+ for name in ['sin', 'cos', 'tan']: