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

Update to sagemath 8.7.

Browse source 
- Drop upstreamed -giac patch.
- Add -sagetex patch to fix a python indentation error.
- Add -rubiks patch to fix compilation of the rubiks library.
- Add -random patch to fix a non-random random bit generator.
- Drop pip3 workaround; the binary is now named just pip again.
This commit is contained in:
Jerry James 2019-04-28 15:12:00 -06:00
parent b6408b9313
commit 05337076b6
21 changed files with 898 additions and 442 deletions
Download patch file Download diff file Expand all files Collapse all files

38
sagemath-openblas.patch
View file

@ -1,16 +1,19 @@
diff -up src/module_list.py.orig src/module_list.py
--- src/module_list.py.orig 2019-01-16 09:47:07.804224297 -0700
+++ src/module_list.py 2019-01-16 09:47:21.611976523 -0700
@@ -11,7 +11,7 @@ SAGE_INC = '/usr/include'
--- src/module_list.py.orig 2019-04-08 15:06:42.789735582 -0600
+++ src/module_list.py 2019-04-08 15:09:46.553467045 -0600
@@ -11,20 +11,17 @@ SAGE_INC = '/usr/include'
import pkgconfig
# CBLAS can be one of multiple implementations
-cblas_pc = pkgconfig.parse('cblas')
+cblas_pc = pkgconfig.parse('openblas')
cblas_libs = cblas_pc['libraries']
cblas_library_dirs = cblas_pc['library_dirs']
cblas_include_dirs = cblas_pc['include_dirs']
@@ -20,11 +20,9 @@ cblas_include_dirs = cblas_pc['include_d
-cblas_libs = cblas_pc['libraries']
-cblas_library_dirs = cblas_pc['library_dirs']
-cblas_include_dirs = cblas_pc['include_dirs']
+cblas_libs = ['openblas']
+cblas_library_dirs = ['/usr/lib']
+cblas_include_dirs = ['/usr/include/openblas']
# TODO: Remove Cygwin hack by installing a suitable cblas.pc
if os.path.exists('/usr/lib/libblas.dll.a'):
cblas_libs = ['gslcblas']
@ -26,14 +29,19 @@ diff -up src/module_list.py.orig src/module_list.py
# GD image library
gd_pc = pkgconfig.parse('gdlib')
diff -up src/sage/misc/cython.py.orig src/sage/misc/cython.py
--- src/sage/misc/cython.py.orig 2019-01-04 10:27:47.031123276 -0700
+++ src/sage/misc/cython.py 2019-01-04 11:18:40.060863533 -0700
@@ -39,7 +39,7 @@ from sage.misc.sage_ostools import resto
--- src/sage/misc/cython.py.orig 2019-04-08 15:05:22.838157654 -0600
+++ src/sage/misc/cython.py 2019-04-08 15:11:50.191262902 -0600
@@ -38,10 +38,9 @@ from sage.misc.sage_ostools import resto
# CBLAS can be one of multiple implementations
-cblas_pc = pkgconfig.parse('cblas')
+cblas_pc = pkgconfig.parse('openblas')
cblas_libs = list(cblas_pc['libraries'])
cblas_library_dirs = list(cblas_pc['library_dirs'])
cblas_include_dirs = list(cblas_pc['include_dirs'])
-cblas_libs = list(cblas_pc['libraries'])
-cblas_library_dirs = list(cblas_pc['library_dirs'])
-cblas_include_dirs = list(cblas_pc['include_dirs'])
+cblas_libs = ['openblas']
+cblas_library_dirs = ['/usr/lib']
+cblas_include_dirs = ['/usr/include/openblas']
standard_libs = [
'mpfr', 'gmp', 'gmpxx', 'stdc++', 'pari', 'm',