mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 19:55:54 -04:00
Version 9.2 (bz 1891244)
- Unbundle widgetsnbextension (bz 1856311) - Unbundle mathjax fonts (bz 1875606) - Do not require the -doc subpackage from the main package (bz 1867123) - Drop upstreamed patches: -ecl, -fes, -includes, -sagetex, -sigfpe, -sympy
This commit is contained in:
Jerry James
parent
de0ac7db5f
commit
861d3bcc88
34 changed files with 1210 additions and 4460 deletions
|
|
@ -1,7 +1,93 @@
|
|||
diff -up src/module_list.py.orig src/module_list.py
|
||||
--- src/module_list.py.orig 2019-10-03 16:51:55.350850836 -0300
|
||||
+++ src/module_list.py 2019-10-03 16:52:06.479917297 -0300
|
||||
@@ -11,20 +11,17 @@ SAGE_INC = '/usr/include'
|
||||
diff -up src/sage/env.py.orig src/sage/env.py
|
||||
--- src/sage/env.py.orig 2020-10-30 16:10:20.089999891 -0600
|
||||
+++ src/sage/env.py 2020-10-31 12:11:19.256615196 -0600
|
||||
@@ -391,7 +391,7 @@ def cython_aliases():
|
||||
aliases = {}
|
||||
|
||||
for lib in ['fflas-ffpack', 'givaro', 'gsl', 'linbox', 'Singular',
|
||||
- 'libpng', 'gdlib', 'm4ri', 'zlib', 'cblas', 'lapack']:
|
||||
+ 'libpng', 'gdlib', 'm4ri', 'zlib', 'flexiblas']:
|
||||
var = lib.upper().replace("-", "") + "_"
|
||||
if lib == 'zlib':
|
||||
aliases[var + "CFLAGS"] = ""
|
||||
diff -up src/sage/matrix/matrix_integer_dense.pyx.orig src/sage/matrix/matrix_integer_dense.pyx
|
||||
--- src/sage/matrix/matrix_integer_dense.pyx.orig 2020-10-30 11:52:49.737274785 -0600
|
||||
+++ src/sage/matrix/matrix_integer_dense.pyx 2020-10-31 17:58:56.243063508 -0600
|
||||
@@ -1,8 +1,8 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# distutils: extra_compile_args = M4RI_CFLAGS
|
||||
-# distutils: libraries = iml ntl gmp m CBLAS_LIBRARIES
|
||||
-# distutils: library_dirs = CBLAS_LIBDIR
|
||||
-# distutils: include_dirs = M4RI_INCDIR CBLAS_INCDIR
|
||||
+# distutils: libraries = iml ntl gmp m FLEXIBLAS_LIBRARIES
|
||||
+# distutils: library_dirs = FLEXIBLAS_LIBDIR
|
||||
+# distutils: include_dirs = M4RI_INCDIR FLEXIBLAS_INCDIR
|
||||
"""
|
||||
Dense matrices over the integer ring
|
||||
|
||||
diff -up src/sage/matrix/matrix_modn_dense_double.pyx.orig src/sage/matrix/matrix_modn_dense_double.pyx
|
||||
--- src/sage/matrix/matrix_modn_dense_double.pyx.orig 2020-10-24 11:37:59.000000000 -0600
|
||||
+++ src/sage/matrix/matrix_modn_dense_double.pyx 2020-11-05 15:44:59.390454421 -0700
|
||||
@@ -1,7 +1,7 @@
|
||||
# distutils: language = c++
|
||||
-# distutils: libraries = CBLAS_LIBRARIES
|
||||
-# distutils: library_dirs = CBLAS_LIBDIR
|
||||
-# distutils: include_dirs = CBLAS_INCDIR
|
||||
+# distutils: libraries = FLEXIBLAS_LIBRARIES
|
||||
+# distutils: library_dirs = FLEXIBLAS_LIBDIR
|
||||
+# distutils: include_dirs = FLEXIBLAS_INCDIR
|
||||
# distutils: extra_compile_args = -D_XPG6
|
||||
"""
|
||||
Dense matrices over `\ZZ/n\ZZ` for `n < 2^{23}` using LinBox's ``Modular<double>``
|
||||
diff -up src/sage/matrix/matrix_modn_dense_float.pyx.orig src/sage/matrix/matrix_modn_dense_float.pyx
|
||||
--- src/sage/matrix/matrix_modn_dense_float.pyx.orig 2020-11-05 15:44:59.391454421 -0700
|
||||
+++ src/sage/matrix/matrix_modn_dense_float.pyx 2020-11-05 15:45:54.965454564 -0700
|
||||
@@ -1,7 +1,7 @@
|
||||
# distutils: language = c++
|
||||
-# distutils: libraries = CBLAS_LIBRARIES
|
||||
-# distutils: library_dirs = CBLAS_LIBDIR
|
||||
-# distutils: include_dirs = CBLAS_INCDIR
|
||||
+# distutils: libraries = FLEXIBLAS_LIBRARIES
|
||||
+# distutils: library_dirs = FLEXIBLAS_LIBDIR
|
||||
+# distutils: include_dirs = FLEXIBLAS_INCDIR
|
||||
"""
|
||||
Dense matrices over `\ZZ/n\ZZ` for `n < 2^{11}` using LinBox's ``Modular<float>``
|
||||
|
||||
diff -up src/sage/matrix/matrix_rational_dense.pyx.orig src/sage/matrix/matrix_rational_dense.pyx
|
||||
--- src/sage/matrix/matrix_rational_dense.pyx.orig 2020-10-30 11:34:26.031980257 -0600
|
||||
+++ src/sage/matrix/matrix_rational_dense.pyx 2020-10-31 17:58:10.490106273 -0600
|
||||
@@ -1,7 +1,7 @@
|
||||
# distutils: extra_compile_args = -D_XPG6 M4RI_CFLAGS
|
||||
-# distutils: libraries = iml ntl m CBLAS_LIBRARIES
|
||||
-# distutils: library_dirs = CBLAS_LIBDIR
|
||||
-# distutils: include_dirs = M4RI_INCDIR CBLAS_INCDIR
|
||||
+# distutils: libraries = iml ntl m FLEXIBLAS_LIBRARIES
|
||||
+# distutils: library_dirs = FLEXIBLAS_LIBDIR
|
||||
+# distutils: include_dirs = M4RI_INCDIR FLEXIBLAS_INCDIR
|
||||
|
||||
"""
|
||||
Dense matrices over the rational field
|
||||
diff -up src/sage/misc/cython.py.orig src/sage/misc/cython.py
|
||||
--- src/sage/misc/cython.py.orig 2020-10-30 16:08:06.039158996 -0600
|
||||
+++ src/sage/misc/cython.py 2020-10-30 16:24:09.037024792 -0600
|
||||
@@ -35,10 +35,9 @@ from sage.cpython.string import str_to_b
|
||||
|
||||
|
||||
# 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 = ['flexiblas']
|
||||
+cblas_library_dirs = ['/usr/lib']
|
||||
+cblas_include_dirs = ['/usr/include/flexiblas']
|
||||
|
||||
standard_libs = [
|
||||
'mpfr', 'gmp', 'gmpxx', 'pari', 'm',
|
||||
diff -up src/sage_setup/library_order.py.orig src/sage_setup/library_order.py
|
||||
--- src/sage_setup/library_order.py.orig 2020-10-24 11:37:59.000000000 -0600
|
||||
+++ src/sage_setup/library_order.py 2020-10-31 12:11:54.313540360 -0600
|
||||
@@ -10,20 +10,18 @@ import os
|
||||
import pkgconfig
|
||||
|
||||
# CBLAS can be one of multiple implementations
|
||||
|
|
@ -17,31 +103,14 @@ diff -up src/module_list.py.orig src/module_list.py
|
|||
if os.path.exists('/usr/lib/libblas.dll.a'):
|
||||
cblas_libs = ['gslcblas']
|
||||
|
||||
-# LAPACK can be one of multiple implementations
|
||||
# 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 = [ 'flexiblas' ]
|
||||
+lapack_libs = ['flexiblas']
|
||||
+lapack_library_dirs = ['/usr/lib']
|
||||
+lapack_include_dirs = ['/usr/include/flexiblas']
|
||||
|
||||
# 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-10-03 16:51:42.848776173 -0300
|
||||
+++ src/sage/misc/cython.py 2019-10-03 16:52:06.480917303 -0300
|
||||
@@ -35,10 +35,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 = ['flexiblas']
|
||||
+cblas_library_dirs = ['/usr/lib']
|
||||
+cblas_include_dirs = ['/usr/include/flexiblas']
|
||||
|
||||
standard_libs = [
|
||||
'mpfr', 'gmp', 'gmpxx', 'stdc++', 'pari', 'm',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue