mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 11:45:56 -04:00
Update to sagemath 8.5.
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.
This commit is contained in:
parent
eaa777c690
commit
55beead27c
31 changed files with 674 additions and 684 deletions
|
@ -1,6 +1,6 @@
|
|||
diff -up src/sage/env.py.orig src/sage/env.py
|
||||
--- src/sage/env.py.orig 2018-10-17 17:13:36.000000000 -0600
|
||||
+++ src/sage/env.py 2018-10-25 14:10:21.564960823 -0600
|
||||
--- src/sage/env.py.orig 2018-12-22 16:37:08.000000000 -0700
|
||||
+++ src/sage/env.py 2019-01-04 11:08:22.825475344 -0700
|
||||
@@ -164,7 +164,7 @@ _add_variable_or_fallback('CONWAY_POLYNO
|
||||
_add_variable_or_fallback('GRAPHS_DATA_DIR', opj('$SAGE_SHARE','graphs'))
|
||||
_add_variable_or_fallback('ELLCURVE_DATA_DIR',opj('$SAGE_SHARE','ellcurves'))
|
||||
|
@ -11,8 +11,8 @@ diff -up src/sage/env.py.orig src/sage/env.py
|
|||
_add_variable_or_fallback('COMBINATORIAL_DESIGN_DATA_DIR', opj('$SAGE_SHARE', 'combinatorial_designs'))
|
||||
_add_variable_or_fallback('CREMONA_MINI_DATA_DIR', opj('$SAGE_SHARE', 'cremona'))
|
||||
diff -up src/sage/libs/gap/test/main.c.orig src/sage/libs/gap/test/main.c
|
||||
--- src/sage/libs/gap/test/main.c.orig 2018-10-17 17:13:52.000000000 -0600
|
||||
+++ src/sage/libs/gap/test/main.c 2018-10-25 14:05:51.458727612 -0600
|
||||
--- src/sage/libs/gap/test/main.c.orig 2018-12-22 16:37:08.000000000 -0700
|
||||
+++ src/sage/libs/gap/test/main.c 2019-01-04 11:08:22.842475024 -0700
|
||||
@@ -22,7 +22,7 @@ void eval(char* cmd) {
|
||||
libgap_start_interaction(cmd);
|
||||
|
||||
|
@ -23,9 +23,9 @@ diff -up src/sage/libs/gap/test/main.c.orig src/sage/libs/gap/test/main.c
|
|||
char* out = libgap_get_output();
|
||||
libgap_exit();
|
||||
diff -up src/sage/libs/gap/util.pyx.orig src/sage/libs/gap/util.pyx
|
||||
--- src/sage/libs/gap/util.pyx.orig 2018-10-25 13:50:51.168295628 -0600
|
||||
+++ src/sage/libs/gap/util.pyx 2018-10-25 14:05:51.458727612 -0600
|
||||
@@ -25,6 +25,8 @@ from sage.cpython.string cimport str_to_
|
||||
--- src/sage/libs/gap/util.pyx.orig 2018-12-22 16:37:08.000000000 -0700
|
||||
+++ src/sage/libs/gap/util.pyx 2019-01-04 11:08:22.843475005 -0700
|
||||
@@ -27,6 +27,8 @@ from sage.cpython.string cimport str_to_
|
||||
from sage.interfaces.gap_workspace import prepare_workspace_dir
|
||||
from sage.env import SAGE_LOCAL, GAP_ROOT_DIR
|
||||
|
||||
|
@ -34,16 +34,16 @@ diff -up src/sage/libs/gap/util.pyx.orig src/sage/libs/gap/util.pyx
|
|||
|
||||
############################################################################
|
||||
### Hooking into the GAP memory management #################################
|
||||
@@ -164,7 +166,7 @@ def gap_root():
|
||||
@@ -185,7 +187,7 @@ def gap_root():
|
||||
|
||||
sage: from sage.libs.gap.util import gap_root
|
||||
sage: gap_root() # random output
|
||||
- '/home/vbraun/opt/sage-5.3.rc0/local/gap/latest'
|
||||
+ '/usr/lib/gap'
|
||||
"""
|
||||
import os.path
|
||||
if os.path.exists(GAP_ROOT_DIR):
|
||||
@@ -232,6 +234,7 @@ cdef initialize():
|
||||
try:
|
||||
if os.path.exists(GAP_ROOT_DIR):
|
||||
@@ -251,6 +253,7 @@ cdef initialize():
|
||||
libgap_initialize(argc, argv)
|
||||
gap_error_msg = char_to_str(libgap_get_output())
|
||||
libgap_finish_interaction()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue