diff options
Diffstat (limited to 'libre/sagemath/env.patch')
| -rw-r--r-- | libre/sagemath/env.patch | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/libre/sagemath/env.patch b/libre/sagemath/env.patch index e4a1be329..96d080e23 100644 --- a/libre/sagemath/env.patch +++ b/libre/sagemath/env.patch @@ -43,7 +43,7 @@ # Don't execute the commands more than once for the same version of # sage-env. Check this after checking the validity of SAGE_ROOT, but -@@ -245,20 +211,12 @@ +@@ -245,21 +211,13 @@ fi # Setting Sage-related location environment variables. @@ -54,7 +54,8 @@ -export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed" -export SAGE_LOGS="$SAGE_ROOT/logs/pkgs" -export SAGE_SRC="$SAGE_ROOT/src" --export SAGE_DOC="$SAGE_SRC/doc" +-export SAGE_DOC_SRC="$SAGE_SRC/doc" +-export SAGE_DOC="$SAGE_SHARE/doc/sage" - -if [ -z "${SAGE_ORIG_PATH_SET}" ]; then - SAGE_ORIG_PATH=$PATH && export SAGE_ORIG_PATH @@ -66,6 +67,7 @@ +export SAGE_SHARE="$SAGE_LOCAL/share/sage" +export SAGE_EXTCODE="$SAGE_SHARE/ext" +export SAGE_SRC="$SAGE_SHARE/source" ++export SAGE_DOC_SRC="$SAGE_SRC/doc" +export SAGE_DOC="/usr/share/doc/sage" # We offer a toolchain option, so if $SAGE_LOCAL/toolchain/toolchain-env exists source it. @@ -80,10 +82,13 @@ if [ -z "$SAGE_REPO_ANONYMOUS" ]; then SAGE_REPO_ANONYMOUS="git://trac.sagemath.org/sage.git" export SAGE_REPO_ANONYMOUS -@@ -363,30 +318,17 @@ +@@ -363,38 +318,33 @@ export SAGE_STARTUP_FILE fi ++export LIBMTX="$DOT_SAGE/meataxe" ++[[ -d $LIBMTX ]] || mkdir $LIBMTX # Create meataxe data dir ++ -IPYTHONDIR=`find "$SAGE_SPKG_INST" -name "ipython*"` -if [ -n "$IPYTHONDIR" ]; then - export IPYTHONDIR="$DOT_SAGE/${IPYTHONDIR##*/}" @@ -95,19 +100,27 @@ export PYTHON_EGG_CACHE fi + # Set PYTHONUSERBASE to avoid picking up non-Sage versions of + # Matplotlib, numpy, etc. See http://trac.sagemath.org/ticket/19612. + # + # For more history (it used to be PYTHONNOUSERSITE=yes which killed + # the ability to do "sage -pip install PACKAGE --user"), see + # http://trac.sagemath.org/ticket/14243 and + # http://trac.sagemath.org/ticket/18955. + + if [ "$PYTHONUSERBASE" = "" ]; then + PYTHONUSERBASE="$DOT_SAGE/local" + export PYTHONUSERBASE + fi + -if [ -d "$SAGE_LOCAL/lib/python" ]; then - PYTHONPATH="$SAGE_LOCAL/lib/python:$SAGE_LOCAL/lib/python/site_packages" - if [ -n "$SAGE_PATH" ]; then - PYTHONPATH="$SAGE_PATH:$PYTHONPATH" - fi - PYTHONHOME="$SAGE_LOCAL" -- # Set PYTHONNOUSERSITE to avoid picking up non-Sage versions of -- # Matplotlib, numpy, etc. See http://trac.sagemath.org/ticket/14243 -- # and http://trac.sagemath.org/ticket/18955. -- PYTHONNOUSERSITE=yes - export PYTHONPATH - export PYTHONHOME -- export PYTHONNOUSERSITE -fi +PYTHONPATH="/usr/lib/sage/site-packages:$PYTHONPATH" +PYTHONHOME="$SAGE_ROOT" |