zyppe/sagemath
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/sagemath.git synced 2025-04-22 03:39:03 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update to sagemath 7.5.1

Browse source
This commit is contained in:
pcpa 2017-04-06 08:02:52 -04:00
parent ac3aa7f6b7
commit 056e08d023
24 changed files with 481 additions and 439 deletions
Download patch file Download diff file Expand all files Collapse all files

31
sagemath-atlas.patch
View file

@ -1,15 +1,15 @@
diff -up src/module_list.py.orig src/module_list.py
--- src/module_list.py.orig 2016-10-20 09:16:23.105695029 -0400
+++ src/module_list.py 2016-10-20 09:17:17.868697126 -0400
--- src/module_list.py.orig 2017-03-29 19:33:34.149118879 -0400
+++ src/module_list.py 2017-03-29 19:34:09.520120233 -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 = list(cblas_pc['libraries'])
cblas_library_dirs = list(cblas_pc['library_dirs'])
cblas_include_dirs = list(cblas_pc['include_dirs'])
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'):
@ -17,27 +17,28 @@ diff -up src/module_list.py.orig src/module_list.py
-
-# LAPACK can be one of multiple implementations
-lapack_pc = pkgconfig.parse('lapack')
-lapack_libs = list(lapack_pc['libraries'])
-lapack_library_dirs = list(lapack_pc['library_dirs'])
-lapack_include_dirs = list(lapack_pc['include_dirs'])
-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')
@@ -43,7 +37,7 @@ givaro_cflags = pkgconfig.cflags('givaro
# Note we replace the built-in gslcblas with the above cblas
@@ -45,7 +39,8 @@ givaro_cflags = pkgconfig.cflags('givaro
gsl_pc = pkgconfig.parse('gsl')
gsl_libs = list(gsl_pc['libraries'].difference(['gslcblas']).union(cblas_libs))
-gsl_library_dirs = list(gsl_pc['library_dirs'])
gsl_libs = gsl_pc['libraries']
gsl_libs.remove('gslcblas')
-gsl_library_dirs = gsl_pc['library_dirs']
+gsl_libs.extend(cblas_libs)
+gsl_library_dirs = list(cblas_pc['library_dirs'])
gsl_include_dirs = list(gsl_pc['include_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 2016-10-20 09:17:25.057697402 -0400
+++ src/sage/misc/cython.py 2016-10-20 09:17:43.339698102 -0400
--- src/sage/misc/cython.py.orig 2017-03-29 19:33:27.181118612 -0400
+++ src/sage/misc/cython.py 2017-03-29 19:33:36.568118971 -0400
@@ -30,15 +30,11 @@ import pkgconfig