mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-11 12:25:11 +08:00
133 lines
4.3 KiB
Diff
133 lines
4.3 KiB
Diff
--- src/bin/sage-env.orig 2015-01-06 10:46:04.469687605 +0100
|
|
+++ src/bin/sage-env 2015-01-06 10:49:59.547762019 +0100
|
|
@@ -110,41 +110,7 @@
|
|
}
|
|
|
|
|
|
-# New value for SAGE_ROOT: either SAGE_ROOT (if given)
|
|
-# or a guessed value based on pwd.
|
|
-if [ -n "$SAGE_ROOT" ]; then
|
|
- NEW_SAGE_ROOT="$SAGE_ROOT"
|
|
-elif [ -f sage -a -d build ]; then
|
|
- NEW_SAGE_ROOT="."
|
|
-elif [ -f ../../sage -a -d ../../build ]; then
|
|
- NEW_SAGE_ROOT="../.."
|
|
-else
|
|
- # No idea what SAGE_ROOT should be...
|
|
- echo >&2 "Error: You must set the SAGE_ROOT environment variable or run this"
|
|
- echo >&2 "script from the SAGE_ROOT or SAGE_ROOT/local/bin/ directory."
|
|
- return 1
|
|
-fi
|
|
-
|
|
-# Make NEW_SAGE_ROOT absolute
|
|
-NEW_SAGE_ROOT=`cd "$NEW_SAGE_ROOT" && pwd -P`
|
|
-
|
|
-# Sanity check NEW_SAGE_ROOT
|
|
-if [ -f "$NEW_SAGE_ROOT/sage" -a -d "$NEW_SAGE_ROOT/build" ]; then
|
|
- :
|
|
-else
|
|
- echo >&2 "Error: SAGE_ROOT is set to a bad value:"
|
|
- echo >&2 "SAGE_ROOT=$SAGE_ROOT"
|
|
- echo >&2 "You must correct it or erase it and run this script from the SAGE_ROOT"
|
|
- echo >&2 "or SAGE_ROOT/local/bin/ directory."
|
|
- return 1
|
|
-fi
|
|
-
|
|
-# Warn if NEW_SAGE_ROOT does not equal the old SAGE_ROOT
|
|
-if [ "$SAGE_ROOT" != "$NEW_SAGE_ROOT" -a -n "$SAGE_ROOT" ]; then
|
|
- echo >&2 "Warning: overwriting SAGE_ROOT environment variable:"
|
|
- echo >&2 "Old SAGE_ROOT=$SAGE_ROOT"
|
|
- echo >&2 "New SAGE_ROOT=$NEW_SAGE_ROOT"
|
|
-fi
|
|
+NEW_SAGE_ROOT="/usr"
|
|
|
|
# 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 @@
|
|
fi
|
|
|
|
# Setting Sage-related location environment variables.
|
|
-export SAGE_LOCAL="$SAGE_ROOT/local"
|
|
-export SAGE_ETC="$SAGE_LOCAL/etc"
|
|
-export SAGE_SHARE="$SAGE_LOCAL/share"
|
|
-export SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
|
|
-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"
|
|
-
|
|
-if [ -z "${SAGE_ORIG_PATH_SET}" ]; then
|
|
- SAGE_ORIG_PATH=$PATH && export SAGE_ORIG_PATH
|
|
- SAGE_ORIG_PATH_SET=True && export SAGE_ORIG_PATH_SET
|
|
-fi
|
|
-export PATH="$SAGE_SRC/bin:$SAGE_LOCAL/bin:$PATH"
|
|
+export SAGE_LOCAL="$SAGE_ROOT"
|
|
+export SAGE_ETC="/etc/sage"
|
|
+export SAGE_SHARE="$SAGE_LOCAL/share/sage"
|
|
+export SAGE_EXTCODE="$SAGE_SHARE/ext"
|
|
+export SAGE_SRC="$SAGE_SHARE/src"
|
|
+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
|
|
|
|
-SINGULARPATH="$SAGE_LOCAL/share/singular" && export SINGULARPATH
|
|
-SINGULAR_EXECUTABLE="$SAGE_LOCAL/bin/Singular" && export SINGULAR_EXECUTABLE
|
|
-
|
|
if [ "$SAGE_SERVER" = "" ]; then
|
|
SAGE_SERVER="http://www.sagemath.org/"
|
|
export SAGE_SERVER
|
|
@@ -363,25 +318,17 @@
|
|
export SAGE_STARTUP_FILE
|
|
fi
|
|
|
|
-IPYTHONDIR=`find "$SAGE_SPKG_INST" -name "ipython*"`
|
|
-if [ -n "$IPYTHONDIR" ]; then
|
|
- export IPYTHONDIR="$DOT_SAGE/${IPYTHONDIR##*/}"
|
|
-fi
|
|
+export IPYTHONDIR="$DOT_SAGE/ipython"
|
|
|
|
if [ "$PYTHON_EGG_CACHE" = "" ]; then
|
|
PYTHON_EGG_CACHE="$DOT_SAGE/.python-eggs"
|
|
export PYTHON_EGG_CACHE
|
|
fi
|
|
|
|
-if [ -d "$SAGE_ROOT/local/lib/python" ]; then
|
|
- PYTHONPATH="$SAGE_ROOT/local/lib/python"
|
|
- if [ -n "$SAGE_PATH" ]; then
|
|
- PYTHONPATH="$SAGE_PATH:$PYTHONPATH"
|
|
- fi
|
|
- PYTHONHOME="$SAGE_ROOT/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
|
|
@@ -429,8 +376,6 @@
|
|
unset R_HOME
|
|
unset R_PROFILE
|
|
|
|
-MAXIMA_PREFIX="$SAGE_ROOT/local" && export MAXIMA_PREFIX
|
|
-
|
|
############ architecture flags
|
|
|
|
# Support flags to change the build architecture. Currently, this is
|
|
@@ -602,9 +547,6 @@
|
|
LD_LIBRARY_PATH="$SAGE_LOCAL/bin:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH
|
|
fi
|
|
|
|
-# See trac 7186 -- this is needed if ecl is moved
|
|
-ECLDIR="$SAGE_LOCAL/lib/ecl/" && export ECLDIR
|
|
-
|
|
# Handle parallel building/testing/...
|
|
# See Trac Ticket #12016
|
|
# First, figure out the right values for SAGE_NUM_THREADS (default
|