diff options
| author | Justin Lecher <jlec@gentoo.org> | 2015-12-16 09:48:45 +0100 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-12-16 09:49:12 +0100 |
| commit | e5ce90a04e79f6413604e96e4803cb95ada7c859 (patch) | |
| tree | 74a780cef62c2d9faf131600f497f5a7d80542ad /dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch | |
| parent | 169624506656f3aa0195c4b4b212bf6159c5524c (diff) | |
| download | gentoo-e5ce90a04e79f6413604e96e4803cb95ada7c859.tar.gz gentoo-e5ce90a04e79f6413604e96e4803cb95ada7c859.tar.xz | |
dev-python/numpy: Fix linking to cblas and update docs
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=567938
Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch')
| -rw-r--r-- | dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch | 37 |
1 files changed, 33 insertions, 4 deletions
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 index 674dbfadbf0..db4a47d4d67 100644 --- 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 @@ -1,11 +1,11 @@ - numpy/distutils/system_info.py | 21 +-------------------- - 1 file changed, 1 insertion(+), 20 deletions(-) + numpy/distutils/system_info.py | 29 +++++------------------------ + 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -index a050430..d0878a5 100644 +index d7eb49e..aa62b09 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py -@@ -303,26 +303,7 @@ def get_info(name, notfound_action=0): +@@ -306,26 +306,7 @@ def get_info(name, notfound_action=0): 1 - display warning message 2 - raise error """ @@ -33,3 +33,32 @@ index a050430..d0878a5 100644 'fft_opt': fft_opt_info, 'fftw': fftw_info, 'fftw2': fftw2_info, +@@ -1690,7 +1671,7 @@ class blas_info(system_info): + lib = self.has_cblas(info) + if lib is not None: + info['language'] = 'c' +- info['libraries'] = [lib] ++ info['libraries'] = lib + info['define_macros'] = [('HAVE_CBLAS', None)] + self.set_info(**info) + +@@ -1722,16 +1703,16 @@ class blas_info(system_info): + # check for cblas lib, and if not present check for blas lib. + try: + c.link_executable(obj, os.path.join(tmpdir, "a.out"), +- libraries=["cblas"], ++ libraries=info["libraries"], + library_dirs=info['library_dirs'], + extra_postargs=info.get('extra_link_args', [])) +- res = "cblas" ++ res = info["libraries"] + except distutils.ccompiler.LinkError: + c.link_executable(obj, os.path.join(tmpdir, "a.out"), + libraries=["blas"], + library_dirs=info['library_dirs'], + extra_postargs=info.get('extra_link_args', [])) +- res = "blas" ++ res = ["blas"] + except distutils.ccompiler.CompileError: + res = None + finally: |