forked from pool/python-numpy
Dominique Leuenberger
e11fb1df02
1 OBS-URL: https://build.opensuse.org/request/show/386196 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-numpy?expand=0&rev=49
40 lines
2.1 KiB
Diff
40 lines
2.1 KiB
Diff
diff -Npru numpy-1.10.4.orig/numpy/distutils/system_info.py numpy-1.10.4/numpy/distutils/system_info.py
|
|
--- numpy-1.10.4.orig/numpy/distutils/system_info.py 2016-03-29 17:35:18.195045099 -0400
|
|
+++ numpy-1.10.4/numpy/distutils/system_info.py 2016-03-30 15:14:40.981853527 -0400
|
|
@@ -1688,9 +1688,10 @@ class blas_info(system_info):
|
|
info['language'] = 'f77' # XXX: is it generally true?
|
|
else:
|
|
lib = self.has_cblas(info)
|
|
+ # In openSUSE, both libblas.so and libcblas.so are needed.
|
|
if lib is not None:
|
|
info['language'] = 'c'
|
|
- info['libraries'] = [lib]
|
|
+ info['libraries'] = [lib,'blas']
|
|
info['define_macros'] = [('HAVE_CBLAS', None)]
|
|
self.set_info(**info)
|
|
|
|
@@ -1720,18 +1721,19 @@ class blas_info(system_info):
|
|
# check we can link (find library)
|
|
# some systems have separate cblas and blas libs. First
|
|
# check for cblas lib, and if not present check for blas lib.
|
|
+ # In openSUSE, libcblas.so dose not contain symbols in libblas.so
|
|
try:
|
|
c.link_executable(obj, os.path.join(tmpdir, "a.out"),
|
|
- libraries=["cblas"],
|
|
+ libraries=["blas"],
|
|
library_dirs=info['library_dirs'],
|
|
extra_postargs=info.get('extra_link_args', []))
|
|
- res = "cblas"
|
|
+ res = "blas"
|
|
except distutils.ccompiler.LinkError:
|
|
c.link_executable(obj, os.path.join(tmpdir, "a.out"),
|
|
- libraries=["blas"],
|
|
+ libraries=["cblas","blas"],
|
|
library_dirs=info['library_dirs'],
|
|
extra_postargs=info.get('extra_link_args', []))
|
|
- res = "blas"
|
|
+ res = "cblas"
|
|
except distutils.ccompiler.CompileError:
|
|
res = None
|
|
finally:
|