mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 03:39:03 -04:00
55beead27c
Also: - Bundle ipython again; Fedora version is too far ahead. Also have to bundle prompt_toolkit since Fedora version is too far ahead of bundled ipython. - Drop LANGUAGES variable setting, now ignored by the sagemath build system. - Drop unused SAGE_CBLAS variable from /usr/bin/sage. - Do not force the C locale when launching sagemath. - Allow the user to override SAGE_DEBUG in /usr/bin/sage. - Add -ecm, -giac, and -latte patches to fix interactions with external tools. - Add -sigfpe patch from upstream.
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
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'
|
|
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
|
|
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-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
|
|
|
|
|
|
# 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'])
|