| 1 |
commit: 825d57bd12b8538ad1f42b26348966c81776a622 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 17 17:14:49 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 17 17:14:55 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=825d57bd |
| 7 |
|
| 8 |
dev-python/numpy: Revert accidental change to patch |
| 9 |
|
| 10 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=568454 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.26 |
| 13 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 14 |
|
| 15 |
.../numpy/files/numpy-1.9.2-no-hardcode-blas.patch | 37 +++------------------- |
| 16 |
1 file changed, 4 insertions(+), 33 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch |
| 19 |
index db4a47d..674dbfa 100644 |
| 20 |
--- a/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch |
| 21 |
+++ b/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch |
| 22 |
@@ -1,11 +1,11 @@ |
| 23 |
- numpy/distutils/system_info.py | 29 +++++------------------------ |
| 24 |
- 1 file changed, 5 insertions(+), 24 deletions(-) |
| 25 |
+ numpy/distutils/system_info.py | 21 +-------------------- |
| 26 |
+ 1 file changed, 1 insertion(+), 20 deletions(-) |
| 27 |
|
| 28 |
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py |
| 29 |
-index d7eb49e..aa62b09 100644 |
| 30 |
+index a050430..d0878a5 100644 |
| 31 |
--- a/numpy/distutils/system_info.py |
| 32 |
+++ b/numpy/distutils/system_info.py |
| 33 |
-@@ -306,26 +306,7 @@ def get_info(name, notfound_action=0): |
| 34 |
+@@ -303,26 +303,7 @@ def get_info(name, notfound_action=0): |
| 35 |
1 - display warning message |
| 36 |
2 - raise error |
| 37 |
""" |
| 38 |
@@ -33,32 +33,3 @@ index d7eb49e..aa62b09 100644 |
| 39 |
'fft_opt': fft_opt_info, |
| 40 |
'fftw': fftw_info, |
| 41 |
'fftw2': fftw2_info, |
| 42 |
-@@ -1690,7 +1671,7 @@ class blas_info(system_info): |
| 43 |
- lib = self.has_cblas(info) |
| 44 |
- if lib is not None: |
| 45 |
- info['language'] = 'c' |
| 46 |
-- info['libraries'] = [lib] |
| 47 |
-+ info['libraries'] = lib |
| 48 |
- info['define_macros'] = [('HAVE_CBLAS', None)] |
| 49 |
- self.set_info(**info) |
| 50 |
- |
| 51 |
-@@ -1722,16 +1703,16 @@ class blas_info(system_info): |
| 52 |
- # check for cblas lib, and if not present check for blas lib. |
| 53 |
- try: |
| 54 |
- c.link_executable(obj, os.path.join(tmpdir, "a.out"), |
| 55 |
-- libraries=["cblas"], |
| 56 |
-+ libraries=info["libraries"], |
| 57 |
- library_dirs=info['library_dirs'], |
| 58 |
- extra_postargs=info.get('extra_link_args', [])) |
| 59 |
-- res = "cblas" |
| 60 |
-+ res = info["libraries"] |
| 61 |
- except distutils.ccompiler.LinkError: |
| 62 |
- c.link_executable(obj, os.path.join(tmpdir, "a.out"), |
| 63 |
- libraries=["blas"], |
| 64 |
- library_dirs=info['library_dirs'], |
| 65 |
- extra_postargs=info.get('extra_link_args', [])) |
| 66 |
-- res = "blas" |
| 67 |
-+ res = ["blas"] |
| 68 |
- except distutils.ccompiler.CompileError: |
| 69 |
- res = None |
| 70 |
- finally: |
Archives