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

Version 9.5.

Browse source 
Drop unnecessary -4ti2 and -primecount patches.
This commit is contained in:
Jerry James 2022-03-21 08:59:27 -06:00
parent 82b1c380fc
commit 30bb46d8dc
16 changed files with 510 additions and 622 deletions
Download patch file Download diff file Expand all files Collapse all files

33
sagemath-env.patch
View file

@ -1,22 +1,6 @@
diff -up src/bin/sage-env.orig src/bin/sage-env
--- src/bin/sage-env.orig 2021-08-22 02:44:33.000000000 -0600
+++ src/bin/sage-env 2021-08-27 08:49:17.252812930 -0600
@@ -333,10 +333,8 @@ if [ -n "$SAGE_LOCAL" ]; then
export CPATH="$SAGE_LOCAL/include${CPATH}"
fi
-if [ -n "$SAGE_LOCAL" ]; then
- SINGULARPATH="$SAGE_LOCAL/share/singular" && export SINGULARPATH
- SINGULAR_EXECUTABLE="$SAGE_LOCAL/bin/Singular" && export SINGULAR_EXECUTABLE
-fi
+SINGULARPATH="/usr/share/singular" && export SINGULARPATH
+SINGULAR_EXECUTABLE="/usr/bin/Singular" && export SINGULAR_EXECUTABLE
if [ -z "$SAGE_REPO_ANONYMOUS" ]; then
SAGE_REPO_ANONYMOUS="https://gitlab.com/sagemath/dev/tracmirror.git"
diff -up src/sage/env.py.orig src/sage/env.py
--- src/sage/env.py.orig 2021-08-27 08:46:35.399958049 -0600
+++ src/sage/env.py 2021-08-27 08:46:48.584192481 -0600
--- src/sage/env.py.orig 2022-03-04 16:22:20.700225896 -0700
+++ src/sage/env.py 2022-03-04 16:23:09.566306142 -0700
@@ -166,15 +166,15 @@ SAGE_DATE = var("SAGE_DATE", version.dat
SAGE_VERSION_BANNER = var("SAGE_VERSION_BANNER", version.banner)
@ -53,16 +37,3 @@ diff -up src/sage/env.py.orig src/sage/env.py
MAXIMA = var("MAXIMA", "maxima")
MAXIMA_FAS = var("MAXIMA_FAS")
KENZO_FAS = var("KENZO_FAS")
@@ -309,10 +309,10 @@ def _get_shared_lib_path(*libnames: str)
# locate singular shared object
# On Debian it's libsingular-Singular so try that as well
-SINGULAR_SO = var("SINGULAR_SO", _get_shared_lib_path("Singular", "singular-Singular"))
+SINGULAR_SO = var("SINGULAR_SO", "@@LIBDIR@@/libSingular.so")
# locate libgap shared object
-GAP_SO = var("GAP_SO", _get_shared_lib_path("gap", ""))
+GAP_SO = var("GAP_SO", "@@LIBDIR@@/libgap.so")
# post process
if DOT_SAGE is not None and ' ' in DOT_SAGE: