mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-21 11:19:02 -04:00
59 lines
2.1 KiB
Diff
59 lines
2.1 KiB
Diff
diff -up src/module_list.py.orig src/module_list.py
|
|
--- src/module_list.py.orig 2017-04-11 10:03:27.798279059 -0400
|
|
+++ src/module_list.py 2017-04-11 10:05:34.272283903 -0400
|
|
@@ -12,20 +12,14 @@ 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']
|
|
|
|
-# TODO: Remove Cygwin hack by installing a suitable cblas.pc
|
|
-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 +38,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-04-11 10:05:44.166284281 -0400
|
|
+++ src/sage/misc/cython.py 2017-04-11 10:06:00.016284888 -0400
|
|
@@ -30,15 +30,11 @@ 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'])
|
|
|
|
-# TODO: Remove Cygwin hack by installing a suitable cblas.pc
|
|
-if os.path.exists('/usr/lib/libblas.dll.a'):
|
|
- cblas_libs = 'gslcblas'
|
|
-
|
|
standard_libs = [
|
|
'mpfr', 'gmp', 'gmpxx', 'stdc++', 'pari', 'm',
|
|
'ec', 'gsl',
|