mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-21 11:19:02 -04:00
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
diff -up src/module_list.py.orig src/module_list.py
|
|
--- src/module_list.py.orig 2017-11-08 08:34:54.635233833 -0500
|
|
+++ src/module_list.py 2017-11-08 08:36:05.888236561 -0500
|
|
@@ -12,7 +12,7 @@ SAGE_INC = '/usr/include'
|
|
import pkgconfig
|
|
|
|
# CBLAS can be one of multiple implementations
|
|
-cblas_pc = pkgconfig.parse('cblas')
|
|
+cblas_pc = pkgconfig.parse('atlas')
|
|
cblas_libs = cblas_pc['libraries']
|
|
cblas_library_dirs = cblas_pc['library_dirs']
|
|
cblas_include_dirs = cblas_pc['include_dirs']
|
|
@@ -21,11 +21,9 @@ cblas_include_dirs = cblas_pc['include_d
|
|
if os.path.exists('/usr/lib/libblas.dll.a'):
|
|
cblas_libs = ['gslcblas']
|
|
|
|
-# LAPACK can be one of multiple implementations
|
|
-lapack_pc = pkgconfig.parse('lapack')
|
|
-lapack_libs = lapack_pc['libraries']
|
|
-lapack_library_dirs = lapack_pc['library_dirs']
|
|
-lapack_include_dirs = lapack_pc['include_dirs']
|
|
+lapack_libs = [ 'lapack' ]
|
|
+lapack_library_dirs = []
|
|
+lapack_include_dirs = [ SAGE_INC + '/lapack' ]
|
|
|
|
# FFLAS-FFPACK
|
|
fflas_ffpack_pc = pkgconfig.parse('fflas-ffpack')
|
|
@@ -44,7 +42,9 @@ givaro_cflags = pkgconfig.cflags('givaro
|
|
# The above cblas should already be in the list thanks to #20646
|
|
gsl_pc = pkgconfig.parse('gsl')
|
|
gsl_libs = gsl_pc['libraries']
|
|
-gsl_library_dirs = gsl_pc['library_dirs']
|
|
+gsl_libs.remove('gslcblas')
|
|
+gsl_libs.extend(cblas_libs)
|
|
+gsl_library_dirs = list(cblas_pc['library_dirs'])
|
|
gsl_include_dirs = gsl_pc['include_dirs']
|
|
|
|
# GD image library
|
|
diff -up src/sage/misc/cython.py.orig src/sage/misc/cython.py
|
|
--- src/sage/misc/cython.py.orig 2017-11-08 08:36:27.499237389 -0500
|
|
+++ src/sage/misc/cython.py 2017-11-08 08:36:37.240237762 -0500
|
|
@@ -30,7 +30,7 @@ import pkgconfig
|
|
|
|
|
|
# CBLAS can be one of multiple implementations
|
|
-cblas_pc = pkgconfig.parse('cblas')
|
|
+cblas_pc = pkgconfig.parse('atlas')
|
|
cblas_libs = list(cblas_pc['libraries'])
|
|
cblas_library_dirs = list(cblas_pc['library_dirs'])
|
|
cblas_include_dirs = list(cblas_pc['include_dirs'])
|