mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-28 09:37:29 -08:00
80b2e1b4de
Gentoo-bug: 590464, 591936 * Re-add py3.3 support to prevent depgraph breakage * Fix QA bug installing non-compiled files #590464 * Fix linking due to adding unnecessary -lblas to build system #591936 * Move dev-python/setuptools to DEPEND instead of RDEPEND Package-Manager: portage-2.3.0
72 lines
3.3 KiB
Diff
72 lines
3.3 KiB
Diff
--- numpy-1.11.1/numpy/distutils/system_info.py
|
|
+++ numpy-1.11.1/numpy/distutils/system_info.py
|
|
@@ -312,26 +312,7 @@
|
|
1 - display warning message
|
|
2 - raise error
|
|
"""
|
|
- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead
|
|
- 'atlas_threads': atlas_threads_info, # ditto
|
|
- 'atlas_blas': atlas_blas_info,
|
|
- 'atlas_blas_threads': atlas_blas_threads_info,
|
|
- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead
|
|
- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto
|
|
- 'atlas_3_10': atlas_3_10_info, # use lapack_opt or blas_opt instead
|
|
- 'atlas_3_10_threads': atlas_3_10_threads_info, # ditto
|
|
- 'atlas_3_10_blas': atlas_3_10_blas_info,
|
|
- 'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
|
|
- 'lapack_atlas_3_10': lapack_atlas_3_10_info, # use lapack_opt instead
|
|
- 'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info, # ditto
|
|
- 'mkl': mkl_info,
|
|
- # openblas which may or may not have embedded lapack
|
|
- 'openblas': openblas_info, # use blas_opt instead
|
|
- # openblas with embedded lapack
|
|
- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead
|
|
- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead
|
|
- 'blas_mkl': blas_mkl_info, # use blas_opt instead
|
|
- 'x11': x11_info,
|
|
+ cl = {'x11': x11_info,
|
|
'fft_opt': fft_opt_info,
|
|
'fftw': fftw_info,
|
|
'fftw2': fftw2_info,
|
|
@@ -669,10 +650,7 @@
|
|
return [b for b in [a.strip() for a in libs.split(',')] if b]
|
|
|
|
def get_libraries(self, key='libraries'):
|
|
- if hasattr(self, '_lib_names'):
|
|
- return self.get_libs(key, default=self._lib_names)
|
|
- else:
|
|
- return self.get_libs(key, '')
|
|
+ return self.get_libs(key, '')
|
|
|
|
def library_extensions(self):
|
|
static_exts = ['.a']
|
|
@@ -1685,7 +1663,7 @@
|
|
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)
|
|
|
|
@@ -1718,16 +1696,16 @@
|
|
# 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:
|