mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-10 23:18:51 -04:00
916819fe9b
- Drop upstreamed -eclib patch. - Drop unnecessary -readonly patch. - Unbundle ipywidgets. - Bundle memory_allocator for now.
68 lines
3.4 KiB
Diff
68 lines
3.4 KiB
Diff
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
|
|
@@ -166,15 +166,15 @@ SAGE_DATE = var("SAGE_DATE", version.dat
|
|
SAGE_VERSION_BANNER = var("SAGE_VERSION_BANNER", version.banner)
|
|
|
|
# virtual environment where sagelib is installed
|
|
-SAGE_VENV = var("SAGE_VENV", os.path.abspath(sys.prefix))
|
|
+SAGE_VENV = var("SAGE_VENV", "@@SAGE_LOCAL@@")
|
|
SAGE_LIB = var("SAGE_LIB", os.path.dirname(os.path.dirname(sage.__file__)))
|
|
-SAGE_EXTCODE = var("SAGE_EXTCODE", join(SAGE_LIB, "sage", "ext_data"))
|
|
+SAGE_EXTCODE = var("SAGE_EXTCODE", join("/usr", "share", "sagemath", "etc"))
|
|
SAGE_VENV_SPKG_INST = var("SAGE_VENV_SPKG_INST", join(SAGE_VENV, "var", "lib", "sage", "installed"))
|
|
|
|
# prefix hierarchy where non-Python packages are installed
|
|
SAGE_LOCAL = var("SAGE_LOCAL", SAGE_VENV)
|
|
-SAGE_SHARE = var("SAGE_SHARE", join(SAGE_LOCAL, "share"))
|
|
-SAGE_DOC = var("SAGE_DOC", join(SAGE_SHARE, "doc", "sage"))
|
|
+SAGE_SHARE = var("SAGE_SHARE", join("/usr", "share", "sagemath"))
|
|
+SAGE_DOC = var("SAGE_DOC", join("/usr", "share", "doc", "sagemath"))
|
|
SAGE_SPKG_INST = var("SAGE_SPKG_INST", join(SAGE_LOCAL, "var", "lib", "sage", "installed"))
|
|
|
|
# source tree of the Sage distribution
|
|
@@ -202,11 +202,11 @@ THEBE_DIR = var("THEBE_DIR", join(SAGE_S
|
|
COMBINATORIAL_DESIGN_DATA_DIR = var("COMBINATORIAL_DESIGN_DATA_DIR", join(SAGE_SHARE, "combinatorial_designs"))
|
|
CREMONA_MINI_DATA_DIR = var("CREMONA_MINI_DATA_DIR", join(SAGE_SHARE, "cremona"))
|
|
CREMONA_LARGE_DATA_DIR = var("CREMONA_LARGE_DATA_DIR", join(SAGE_SHARE, "cremona"))
|
|
-JMOL_DIR = var("JMOL_DIR", join(SAGE_SHARE, "jmol"))
|
|
-MATHJAX_DIR = var("MATHJAX_DIR", join(SAGE_SHARE, "mathjax"))
|
|
-MTXLIB = var("MTXLIB", join(SAGE_SHARE, "meataxe"))
|
|
+JMOL_DIR = var("JMOL_DIR", join("/usr", "share", "java", "jmol"))
|
|
+MATHJAX_DIR = var("MATHJAX_DIR", join("/usr", "share", "javascript", "mathjax"))
|
|
+MTXLIB = var("MTXLIB", join(DOT_SAGE, "meataxe"))
|
|
THREEJS_DIR = var("THREEJS_DIR", join(SAGE_SHARE, "threejs-sage"))
|
|
-PPLPY_DOCS = var("PPLPY_DOCS", join(SAGE_SHARE, "doc", "pplpy"))
|
|
+PPLPY_DOCS = var("PPLPY_DOCS", join("/usr", "share", "doc", "python3-pplpy"))
|
|
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:
|