Date: Wednesday, January 20, 2016 @ 16:10:14 Author: arojas Revision: 158129
No need to customize python path anymore Modified: sagemath/trunk/env.patch sagemath/trunk/paths.patch -------------+ env.patch | 10 +++------- paths.patch | 3 +-- 2 files changed, 4 insertions(+), 9 deletions(-) Modified: env.patch =================================================================== --- env.patch 2016-01-20 15:10:01 UTC (rev 158128) +++ env.patch 2016-01-20 15:10:14 UTC (rev 158129) @@ -80,7 +80,7 @@ if [ -z "$SAGE_REPO_ANONYMOUS" ]; then SAGE_REPO_ANONYMOUS="git://trac.sagemath.org/sage.git" export SAGE_REPO_ANONYMOUS -@@ -363,30 +318,17 @@ +@@ -363,30 +318,13 @@ export SAGE_STARTUP_FILE fi @@ -109,14 +109,10 @@ - export PYTHONHOME - export PYTHONNOUSERSITE -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 @@ +@@ -427,8 +374,6 @@ fi fi fi @@ -125,7 +121,7 @@ ############ architecture flags # Support flags to change the build architecture. Currently, this is -@@ -602,9 +547,6 @@ +@@ -598,9 +543,6 @@ LD_LIBRARY_PATH="$SAGE_LOCAL/bin:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH fi Modified: paths.patch =================================================================== --- paths.patch 2016-01-20 15:10:01 UTC (rev 158128) +++ paths.patch 2016-01-20 15:10:14 UTC (rev 158129) @@ -16,8 +16,7 @@ +_add_variable_or_fallback('SAGE_SHARE', opj('$SAGE_LOCAL', 'share', 'sage')) _add_variable_or_fallback('SAGE_SRC', opj('$SAGE_ROOT', 'src')) --_add_variable_or_fallback('SITE_PACKAGES', site.getsitepackages()) -+_add_variable_or_fallback('SITE_PACKAGES', site.getsitepackages()+['/usr/lib/sage/site-packages']) + _add_variable_or_fallback('SITE_PACKAGES', site.getsitepackages()) _add_variable_or_fallback('SAGE_LIB', SITE_PACKAGES[0]) _add_variable_or_fallback('SAGE_CYTHONIZED', opj('$SAGE_SRC', 'build', 'cythonized'))