mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 03:39:03 -04:00
05337076b6
- 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.
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
diff -up src/module_list.py.orig src/module_list.py
|
|
--- 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_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']
|
|
|
|
-# 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' ]
|
|
|
|
# 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-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_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',
|