diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-08-06 04:49:46 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-08-06 04:49:46 -0300 |
| commit | dbd743b99e377238c0e695cfd10d8056ba98aed6 (patch) | |
| tree | a8b4b66fdeddd8077877c3c808020e507331fd71 /libre/sagemath/env.patch | |
| parent | 4cb1aaf9458c8bc6b8a7ae92ed072c13de251a43 (diff) | |
sagemath-7.3-3.parabola1: updating version
Diffstat (limited to 'libre/sagemath/env.patch')
| -rw-r--r-- | libre/sagemath/env.patch | 52 |
1 files changed, 10 insertions, 42 deletions
diff --git a/libre/sagemath/env.patch b/libre/sagemath/env.patch index 0ec5fc68c..5cb93b75f 100644 --- a/libre/sagemath/env.patch +++ b/libre/sagemath/env.patch @@ -70,11 +70,11 @@ +export SAGE_DOC_SRC="/usr/share/doc/sage" +export SAGE_DOC="/usr/share/doc/sage" - # We offer a toolchain option, so if $SAGE_LOCAL/toolchain/toolchain-env exists source it. - # Since the user might do something crazy we do not do any checks, but hope for the best. -@@ -309,9 +267,6 @@ - GIT_TEMPLATE_DIR="$SAGE_LOCAL"/share/git-core/templates && export GIT_TEMPLATE_DIR - GIT_EXEC_PATH="$SAGE_LOCAL"/libexec/git-core && export GIT_EXEC_PATH + if [ "$SAGE_BANNER" = "bare" ]; then + export SAGE_BANNER_TEXT=$(cat "$SAGE_ROOT/VERSION.txt") +@@ -319,9 +277,6 @@ + GPHELP="$SAGE_LOCAL/bin/gphelp" && export GPHELP + GPDOCDIR="$SAGE_LOCAL/share/pari/doc" && export GPDOCDIR -SINGULARPATH="$SAGE_LOCAL/share/singular" && export SINGULARPATH -SINGULAR_EXECUTABLE="$SAGE_LOCAL/bin/Singular" && export SINGULAR_EXECUTABLE @@ -82,7 +82,7 @@ if [ -z "$SAGE_REPO_ANONYMOUS" ]; then SAGE_REPO_ANONYMOUS="git://trac.sagemath.org/sage.git" export SAGE_REPO_ANONYMOUS -@@ -363,38 +318,33 @@ +@@ -364,10 +319,10 @@ export SAGE_STARTUP_FILE fi @@ -97,48 +97,16 @@ if [ "$PYTHON_EGG_CACHE" = "" ]; then PYTHON_EGG_CACHE="$DOT_SAGE/.python-eggs" - 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" -- export PYTHONPATH -- export PYTHONHOME --fi -+PYTHONPATH="/usr/lib/sage/site-packages:$PYTHONPATH" -+PYTHONHOME="$SAGE_ROOT" -+export PYTHONPATH -+export PYTHONHOME - - if [ -z "${SAGE_ORIG_LD_LIBRARY_PATH_SET}" ]; then - SAGE_ORIG_LD_LIBRARY_PATH=$LD_LIBRARY_PATH && export SAGE_ORIG_LD_LIBRARY_PATH -@@ -431,8 +378,6 @@ +@@ -453,8 +400,6 @@ fi fi fi -MAXIMA_PREFIX="$SAGE_ROOT/local" && export MAXIMA_PREFIX - - ############ architecture flags + PERL5LIB="$SAGE_LOCAL/lib/perl5:$PERL5LIB" && export PERL5LIB - # Support flags to change the build architecture. Currently, this is -@@ -602,9 +547,6 @@ + ############ architecture flags +@@ -622,9 +567,6 @@ LD_LIBRARY_PATH="$SAGE_LOCAL/bin:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH fi |