mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 11:45:56 -04:00
Version 9.1.
- Drop upstreamed -nauty patch. - Drop -cbc patch; upstream uses the system Cbc now. - Add -ecl patch for ecl 20.4.24.
This commit is contained in:
Jerry James
parent
4556e3ebb0
commit
eb706cd5f8
15 changed files with 838 additions and 732 deletions
|
|
@ -1,6 +1,6 @@
|
|||
diff -up src/bin/sage.orig src/bin/sage
|
||||
--- src/bin/sage.orig 2020-01-01 04:03:10.000000000 -0700
|
||||
+++ src/bin/sage 2020-02-25 13:37:42.510072662 -0700
|
||||
--- src/bin/sage.orig 2020-05-20 16:33:41.000000000 -0600
|
||||
+++ src/bin/sage 2020-07-06 16:33:49.015329159 -0600
|
||||
@@ -26,13 +26,10 @@ usage() {
|
||||
echo " file.[sage|py|spyx] -- run given .sage, .py or .spyx file"
|
||||
echo " -advanced -- list all command line options"
|
||||
|
|
@ -74,7 +74,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
echo " -python [...] -- run the Python interpreter"
|
||||
echo " -python2 [...] -- run the Python 2 interpreter"
|
||||
echo " -python3 [...] -- run the Python 3 interpreter"
|
||||
@@ -144,55 +125,7 @@ usage_advanced() {
|
||||
@@ -147,55 +128,7 @@ usage_advanced() {
|
||||
echo
|
||||
#### 1.......................26..................................................78
|
||||
#### |.....................--.|...................................................|
|
||||
|
|
@ -131,7 +131,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
echo " -startuptime [module] -- display how long each component of Sage takes to"
|
||||
echo " start up; optionally specify a module to get more"
|
||||
echo " details about that particular module"
|
||||
@@ -226,7 +159,6 @@ usage_advanced() {
|
||||
@@ -229,7 +162,6 @@ usage_advanced() {
|
||||
echo " -coverage <files> -- give info about doctest coverage of files"
|
||||
echo " -coverageall -- give summary info about doctest coverage of all"
|
||||
echo " files in the Sage library"
|
||||
|
|
@ -139,14 +139,12 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
echo " -search_src <string> -- search through all the Sage library code for string"
|
||||
echo " -search_doc <string> -- search through the Sage documentation for string"
|
||||
echo " -grep <string> -- same as -search_src"
|
||||
@@ -252,16 +184,6 @@ usage_advanced() {
|
||||
@@ -255,14 +187,6 @@ usage_advanced() {
|
||||
echo
|
||||
#### 1.......................26..................................................78
|
||||
#### |.....................--.|...................................................|
|
||||
- echo "Making Sage packages or distributions:"
|
||||
- echo " -sdist -- build a source distribution of Sage"
|
||||
- echo " -pkg <dir> -- create Sage package dir.spkg from a given directory"
|
||||
- echo " -pkg_nc <dir> -- as -pkg, but do not compress the package"
|
||||
- echo " -fix-pkg-checksums -- fix the checksums from build/pkgs directories from "
|
||||
- echo " the packages located in upstream/"
|
||||
-
|
||||
|
|
@ -156,7 +154,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
echo "Valgrind memory debugging:"
|
||||
echo " -cachegrind -- run Sage using Valgrind's cachegrind tool. The log"
|
||||
echo " files are named sage-cachegrind.PID can be found in"
|
||||
@@ -275,9 +197,6 @@ usage_advanced() {
|
||||
@@ -276,9 +200,6 @@ usage_advanced() {
|
||||
echo " -memcheck -- run Sage using Valgrind's memcheck tool. The log"
|
||||
echo " files are named sage-memcheck.PID can be found in"
|
||||
echo " $DOT_SAGE"
|
||||
|
|
@ -166,7 +164,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
echo " -valgrind -- this is an alias for -memcheck"
|
||||
echo
|
||||
echo "You can also use -- before a long option, e.g., 'sage --optional'."
|
||||
@@ -287,116 +206,6 @@ usage_advanced() {
|
||||
@@ -288,115 +209,6 @@ usage_advanced() {
|
||||
|
||||
|
||||
#####################################################################
|
||||
|
|
@ -262,7 +260,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
- # Now install the packages
|
||||
- for PKG in $PACKAGES; do
|
||||
- echo
|
||||
- # First check that $PKG is actually a Makefile target
|
||||
- # Check that $PKG is actually a Makefile target
|
||||
- # See https://trac.sagemath.org/ticket/25078
|
||||
- if ! echo "$ALL_TARGETS" | grep "^${PKG}$" >/dev/null; then
|
||||
- echo >&2 "Error: package '$PKG' not found"
|
||||
|
|
@ -271,7 +269,6 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
- fi
|
||||
- $MAKE SAGE_SPKG="sage-spkg $INSTALL_OPTIONS" "$PKG"
|
||||
- done
|
||||
-
|
||||
- echo "New packages may have been installed."
|
||||
- echo "Re-running configure and make in case any dependent packages need updating."
|
||||
- touch "$SAGE_ROOT/configure" && $MAKE all-build
|
||||
|
|
@ -283,7 +280,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
# Report information about the Sage environment
|
||||
#####################################################################
|
||||
|
||||
@@ -445,20 +254,6 @@ fi
|
||||
@@ -445,20 +257,6 @@ fi
|
||||
|
||||
# Prepare for running Sage, either interactively or non-interactively.
|
||||
sage_setup() {
|
||||
|
|
@ -304,7 +301,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ ! -d "$IPYTHONDIR" ]; then
|
||||
# make sure that $DOT_SAGE exists so that ipython will happily
|
||||
# create its config directories there. If DOT_SAGE doesn't
|
||||
@@ -469,20 +264,6 @@ sage_setup() {
|
||||
@@ -469,20 +267,6 @@ sage_setup() {
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -325,7 +322,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
# Start an interactive Sage session, this function never returns.
|
||||
interactive_sage() {
|
||||
sage_setup
|
||||
@@ -566,16 +347,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
|
||||
@@ -566,16 +350,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
|
||||
exec ecl "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -342,8 +339,8 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
|
||||
shift
|
||||
exec maxima "$@"
|
||||
@@ -606,11 +377,6 @@ if [ "$1" = '--pip3' ]; then
|
||||
exec python3 -m pip "$@"
|
||||
@@ -606,11 +380,6 @@ if [ "$1" = '--pip3' ]; then
|
||||
exec "$SAGE_LOCAL"/bin/python3 -m pip "$@"
|
||||
fi
|
||||
|
||||
-if [ "$1" = '-fix-pkg-checksums' -o "$1" = '--fix-pkg-checksums' ]; then
|
||||
|
|
@ -354,8 +351,8 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = '-python' -o "$1" = '--python' ]; then
|
||||
shift
|
||||
if [ "$SAGE_PYTHON3" = 'yes' ]; then
|
||||
@@ -650,16 +416,6 @@ if [ "$1" = '-jupyter' -o "$1" = '--jupy
|
||||
exec jupyter "$@"
|
||||
@@ -650,16 +419,6 @@ if [ "$1" = '-jupyter' -o "$1" = '--jupy
|
||||
exec "$SAGE_LOCAL"/bin/jupyter "$@"
|
||||
fi
|
||||
|
||||
-if [ "$1" = '-git' -o "$1" = '--git' ]; then
|
||||
|
|
@ -368,10 +365,10 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
- exec git --git-dir="$SAGE_ROOT"/.git rev-parse --abbrev-ref HEAD
|
||||
-fi
|
||||
-
|
||||
if [ "$1" = '-sh' -o "$1" = '--sh' ]; then
|
||||
if [ "$1" = '-sh' -o "$1" = '--sh' -o "$1" = '-buildsh' -o "$1" = '--buildsh' ]; then
|
||||
# AUTHORS:
|
||||
# - Carl Witty and William Stein: initial version
|
||||
@@ -779,20 +535,6 @@ EOF
|
||||
@@ -792,20 +551,6 @@ EOF
|
||||
fi
|
||||
|
||||
#####################################################################
|
||||
|
|
@ -392,7 +389,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
# File conversion
|
||||
#####################################################################
|
||||
|
||||
@@ -823,11 +565,6 @@ fi
|
||||
@@ -836,11 +581,6 @@ fi
|
||||
# Run Sage's versions of the standard Algebra/Geometry etc. software
|
||||
#####################################################################
|
||||
|
||||
|
|
@ -404,7 +401,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [[ "$1" =~ ^--notebook=.* || "$1" =~ ^-n=.* || "$1" =~ ^-notebook=.* ]] ; then
|
||||
sage-cleaner &>/dev/null &
|
||||
exec sage-notebook "$@"
|
||||
@@ -838,13 +575,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
|
||||
@@ -851,13 +591,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
|
||||
exec sage-notebook "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -418,7 +415,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = "-inotebook" -o "$1" = '--inotebook' ]; then
|
||||
shift
|
||||
sage-cleaner &>/dev/null &
|
||||
@@ -863,31 +593,12 @@ if [ "$1" = '-grepdoc' -o "$1" = "--grep
|
||||
@@ -876,31 +609,12 @@ if [ "$1" = '-grepdoc' -o "$1" = "--grep
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
|
@ -451,7 +448,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
sage_setup
|
||||
export PYTHONIOENCODING="utf-8" # Fix encoding for doctests
|
||||
if [ "$1" = '-tp' -o "$1" = '-btp' ]; then
|
||||
@@ -899,16 +610,6 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
|
||||
@@ -912,16 +626,6 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -468,7 +465,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = '-testall' -o "$1" = "--testall" ]; then
|
||||
shift
|
||||
sage_setup
|
||||
@@ -923,122 +624,6 @@ if [ "$1" = '-c' ]; then
|
||||
@@ -936,112 +640,6 @@ if [ "$1" = '-c' ]; then
|
||||
exec sage-eval "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -555,16 +552,6 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
- exit 0
|
||||
-fi
|
||||
-
|
||||
-if [ "$1" = '-pkg' -o "$1" = '-spkg' -o "$1" = "--pkg" -o "$1" = "--spkg" ]; then
|
||||
- shift
|
||||
- exec sage-pkg "$@"
|
||||
-fi
|
||||
-
|
||||
-if [ "$1" = '-pkg_nc' -o "$1" = "--pkg_nc" ]; then
|
||||
- shift
|
||||
- exec sage-pkg -n "$@"
|
||||
-fi
|
||||
-
|
||||
-if [ "$1" = '-sdist' -o "$1" = "--sdist" ]; then
|
||||
- maybe_sage_location
|
||||
- shift
|
||||
|
|
@ -591,7 +578,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = '-gdb' -o "$1" = "--gdb" ]; then
|
||||
shift
|
||||
sage_setup
|
||||
@@ -1088,12 +673,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
|
||||
@@ -1091,12 +689,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
|
||||
exec sage-callgrind "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -605,18 +592,29 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
exec sage-startuptime.py "$@"
|
||||
fi
|
||||
diff -up src/bin/sage-valgrind.orig src/bin/sage-valgrind
|
||||
--- src/bin/sage-valgrind.orig 2020-01-01 04:03:10.000000000 -0700
|
||||
+++ src/bin/sage-valgrind 2020-02-25 13:36:02.973848216 -0700
|
||||
@@ -4,17 +4,7 @@ if [ -z $SAGE_EXTCODE ]; then
|
||||
--- src/bin/sage-valgrind.orig 2020-05-20 16:33:41.000000000 -0600
|
||||
+++ src/bin/sage-valgrind 2020-07-07 08:59:38.369847693 -0600
|
||||
@@ -4,28 +4,7 @@ if [ -z $SAGE_EXTCODE ]; then
|
||||
SAGE_EXTCODE=`${0/-valgrind} -c "from sage.env import SAGE_EXTCODE; print(SAGE_EXTCODE)"`
|
||||
fi
|
||||
|
||||
-SUPP=""
|
||||
-if [ -f "$SAGE_EXTCODE/valgrind/python.supp" ]; then
|
||||
- SUPP+=" --suppressions=$SAGE_EXTCODE/valgrind/python.supp"
|
||||
-# Our python2/3 spkgs and also Debian install these files as python.supp and python3.supp
|
||||
-if [ "$SAGE_PYTHON_VERSION" = 2 ]; then
|
||||
- PYTHON_SUPP_FILENAME="python.supp"
|
||||
-else
|
||||
- PYTHON_SUPP_FILENAME="python$SAGE_PYTHON_VERSION.supp"
|
||||
-fi
|
||||
-for dir in "$SAGE_LOCAL/lib/valgrind" "/usr/local/lib/valgrind" "/usr/lib64/valgrind" "/usr/lib/valgrind" ; do
|
||||
- if [ -f "$dir"/"$PYTHON_SUPP_FILENAME" ]; then
|
||||
- SUPP=" --suppressions=$dir/$PYTHON_SUPP_FILENAME"
|
||||
- break
|
||||
- fi
|
||||
-done
|
||||
-if [ -z "$SUPP" ] ; then
|
||||
- echo "Python suppressions not found (not installed?), skipping"
|
||||
-fi
|
||||
-
|
||||
-SUPP+=" --suppressions=$SAGE_EXTCODE/valgrind/pyalloc.supp"
|
||||
-SUPP+=" --suppressions=$SAGE_EXTCODE/valgrind/sage.supp"
|
||||
-SUPP+=" --suppressions=$SAGE_EXTCODE/valgrind/sage-additional.supp"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue