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.4.

Browse source 
Also:
- Build for python 3 instead of python 2 due to upcoming python 2 removal.
- Add -python3 and -escape patches to fix problems with python 3.
- Drop -nofstring patch, only needed for python 2.
- Drop upstreamed -eclib patch.
- Switch from atlas to openblas and rename -atlas patch to -openblas.
- Add -buildroot patch and only build cython interfaces once.
This commit is contained in:
Jerry James 2018-11-01 19:25:26 -06:00
parent 1a0bd1afc6
commit eaa777c690
19 changed files with 1557 additions and 473 deletions
Download patch file Download diff file Expand all files Collapse all files

30
sagemath-libgap.patch
View file

@ -1,30 +1,18 @@
diff -up src/sage/env.py.orig src/sage/env.py
--- src/sage/env.py.orig 2018-08-03 05:10:08.000000000 -0600
+++ src/sage/env.py 2018-08-29 11:25:26.833962117 -0600
--- 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
@@ -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'))
_add_variable_or_fallback('POLYTOPE_DATA_DIR',opj('$SAGE_SHARE','reflexive_polytopes'))
-_add_variable_or_fallback('GAP_ROOT_DIR', opj('$SAGE_LOCAL','gap','latest'))
+_add_variable_or_fallback('GAP_ROOT_DIR', opj('usr','lib','gap'))
+_add_variable_or_fallback('GAP_ROOT_DIR', opj('/usr','lib','gap'))
_add_variable_or_fallback('THEBE_DIR', opj('$SAGE_SHARE','thebe'))
# locate singular shared object
diff -up src/sage/interfaces/gap.py.orig src/sage/interfaces/gap.py
--- src/sage/interfaces/gap.py.orig 2018-08-03 05:10:08.000000000 -0600
+++ src/sage/interfaces/gap.py 2018-08-29 11:21:43.180584324 -0600
@@ -197,7 +197,7 @@ import string
WORKSPACE = gap_workspace_file()
-GAP_BINARY = os.path.join(SAGE_LOCAL, 'bin', 'gap')
+GAP_BINARY = os.path.join('usr', 'bin', 'gap')
first_try = True
_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-08-03 05:10:08.000000000 -0600
+++ src/sage/libs/gap/test/main.c 2018-08-29 10:38:22.512653256 -0600
--- 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
@@ -22,7 +22,7 @@ void eval(char* cmd) {
libgap_start_interaction(cmd);
@ -35,8 +23,8 @@ 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-08-03 05:10:08.000000000 -0600
+++ src/sage/libs/gap/util.pyx 2018-08-29 11:32:06.654205922 -0600
--- 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_
from sage.interfaces.gap_workspace import prepare_workspace_dir
from sage.env import SAGE_LOCAL, GAP_ROOT_DIR