diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-07-29 18:54:06 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-07-29 18:57:00 -0300 |
| commit | 4b9a24484b3f55b017b6cdc30ff372dc310be5f7 (patch) | |
| tree | c25ec60d8d453a0a5280e9f38f31bfe54485f736 /libre/sagemath/env.patch | |
| parent | 84bfa7890271e94520d28cfe0c4caa883896a726 (diff) | |
| download | abslibre-4b9a24484b3f55b017b6cdc30ff372dc310be5f7.tar.gz abslibre-4b9a24484b3f55b017b6cdc30ff372dc310be5f7.tar.bz2 abslibre-4b9a24484b3f55b017b6cdc30ff372dc310be5f7.zip | |
sagemath-6.8-1.parabola1: updating version
* disable fes module, doesn't compile
* replace "open" to "free" term to pkgdesc -> https://www.gnu.org/philosophy/words-to-avoid.html.en#Open
* replace "alternative" to "replacement" term to pkgdesc -> https://www.gnu.org/philosophy/words-to-avoid.html.en#Alternative
Diffstat (limited to 'libre/sagemath/env.patch')
| -rw-r--r-- | libre/sagemath/env.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libre/sagemath/env.patch b/libre/sagemath/env.patch index 9ad163262..d1429e35e 100644 --- a/libre/sagemath/env.patch +++ b/libre/sagemath/env.patch @@ -1,5 +1,5 @@ ---- src/bin/sage-env.orig 2015-05-15 11:32:42.546800174 +0200 -+++ src/bin/sage-env 2015-04-29 15:12:46.000000000 +0200 +--- 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 @@ } @@ -60,7 +60,7 @@ - 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 PATH="$SAGE_ROOT/build/bin:$SAGE_SRC/bin:$SAGE_LOCAL/bin:$PATH" +export SAGE_LOCAL="$SAGE_ROOT" +export SAGE_ETC="/etc/sage" +export SAGE_SHARE="$SAGE_LOCAL/share/sage" @@ -70,17 +70,17 @@ # 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,7 @@ +@@ -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 [ -z "$SAGE_REPO_ANONYMOUS" ]; then SAGE_REPO_ANONYMOUS="git://trac.sagemath.org/sage.git" export SAGE_REPO_ANONYMOUS -@@ -346,25 +310,17 @@ +@@ -363,25 +318,17 @@ export SAGE_STARTUP_FILE fi @@ -95,12 +95,12 @@ export PYTHON_EGG_CACHE fi --if [ -d "$SAGE_ROOT/local/lib/python" ]; then -- PYTHONPATH="$SAGE_ROOT/local/lib/python" +-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_ROOT/local" +- PYTHONHOME="$SAGE_LOCAL" - export PYTHONPATH - export PYTHONHOME -fi @@ -111,16 +111,16 @@ if [ -z "${SAGE_ORIG_LD_LIBRARY_PATH_SET}" ]; then SAGE_ORIG_LD_LIBRARY_PATH=$LD_LIBRARY_PATH && export SAGE_ORIG_LD_LIBRARY_PATH -@@ -412,8 +368,6 @@ - unset R_HOME - unset R_PROFILE - +@@ -431,8 +378,6 @@ + fi + fi + fi -MAXIMA_PREFIX="$SAGE_ROOT/local" && export MAXIMA_PREFIX - ############ architecture flags # Support flags to change the build architecture. Currently, this is -@@ -585,9 +539,6 @@ +@@ -602,9 +547,6 @@ LD_LIBRARY_PATH="$SAGE_LOCAL/bin:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH fi |