summaryrefslogtreecommitdiff
path: root/libre/sagemath/env.patch
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-10-11 23:25:50 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-10-11 23:25:50 -0300
commitdeb5b68dd1190d0fbb114b5bc6b48f8088551f5c (patch)
tree051097f3c651b052292e30acd8ea26ec22142b2b /libre/sagemath/env.patch
parent916f5cad8236529e1df6dd2a0ca41d868e1f5dbd (diff)
downloadabslibre-deb5b68dd1190d0fbb114b5bc6b48f8088551f5c.tar.gz
abslibre-deb5b68dd1190d0fbb114b5bc6b48f8088551f5c.tar.bz2
abslibre-deb5b68dd1190d0fbb114b5bc6b48f8088551f5c.zip
sagemath-6.9-1.parabola1: updating version
Diffstat (limited to 'libre/sagemath/env.patch')
-rw-r--r--libre/sagemath/env.patch7
1 files changed, 6 insertions, 1 deletions
diff --git a/libre/sagemath/env.patch b/libre/sagemath/env.patch
index d1429e35e..b8ca1eb4d 100644
--- a/libre/sagemath/env.patch
+++ b/libre/sagemath/env.patch
@@ -80,7 +80,7 @@
if [ -z "$SAGE_REPO_ANONYMOUS" ]; then
SAGE_REPO_ANONYMOUS="git://trac.sagemath.org/sage.git"
export SAGE_REPO_ANONYMOUS
-@@ -363,25 +318,17 @@
+@@ -363,30 +318,17 @@
export SAGE_STARTUP_FILE
fi
@@ -101,8 +101,13 @@
- 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"