mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 11:45:56 -04:00
Update to sagemath 8.4.
Also: - Build for python 3 instead of python 2 due to upcoming python 2 removal. - Add -python3 and -escape patches to fix problems with python 3. - Drop -nofstring patch, only needed for python 2. - Drop upstreamed -eclib patch. - Switch from atlas to openblas and rename -atlas patch to -openblas. - Add -buildroot patch and only build cython interfaces once.
This commit is contained in:
Jerry James
parent
1a0bd1afc6
commit
eaa777c690
19 changed files with 1557 additions and 473 deletions
|
|
@ -1,6 +1,6 @@
|
|||
diff -up src/bin/sage.orig src/bin/sage
|
||||
--- src/bin/sage.orig 2018-08-03 05:10:08.000000000 -0600
|
||||
+++ src/bin/sage 2018-08-29 08:32:06.325478480 -0600
|
||||
--- src/bin/sage.orig 2018-10-17 17:13:34.000000000 -0600
|
||||
+++ src/bin/sage 2018-10-24 15:19:11.805131334 -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"
|
||||
|
|
@ -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"
|
||||
@@ -220,7 +152,6 @@ usage_advanced() {
|
||||
@@ -223,7 +155,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,7 +139,7 @@ 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"
|
||||
@@ -244,16 +175,6 @@ usage_advanced() {
|
||||
@@ -249,16 +180,6 @@ usage_advanced() {
|
||||
echo
|
||||
#### 1.......................26..................................................78
|
||||
#### |.....................--.|...................................................|
|
||||
|
|
@ -156,7 +156,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"
|
||||
@@ -267,9 +188,6 @@ usage_advanced() {
|
||||
@@ -272,9 +193,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 +166,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'."
|
||||
@@ -279,115 +197,6 @@ usage_advanced() {
|
||||
@@ -284,115 +202,6 @@ usage_advanced() {
|
||||
|
||||
|
||||
#####################################################################
|
||||
|
|
@ -282,7 +282,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
# Report information about the Sage environment
|
||||
#####################################################################
|
||||
|
||||
@@ -416,35 +225,8 @@ if [ $# -gt 0 ]; then
|
||||
@@ -421,35 +230,8 @@ if [ $# -gt 0 ]; then
|
||||
fi
|
||||
|
||||
|
||||
|
|
@ -318,7 +318,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
|
||||
@@ -455,20 +237,6 @@ sage_setup() {
|
||||
@@ -460,20 +242,6 @@ sage_setup() {
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -339,7 +339,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
# Start an interactive Sage session, this function never returns.
|
||||
interactive_sage() {
|
||||
sage_setup
|
||||
@@ -552,16 +320,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
|
||||
@@ -557,16 +325,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
|
||||
exec ecl "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -356,8 +356,8 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
|
||||
shift
|
||||
exec maxima "$@"
|
||||
@@ -587,11 +345,6 @@ if [ "$1" = '-pip' -o "$1" = '--pip' ];
|
||||
exec pip "$@"
|
||||
@@ -592,11 +350,6 @@ if [ "$1" = '-pip' -o "$1" = '--pip' ];
|
||||
exec sage-python23 -m pip "$@"
|
||||
fi
|
||||
|
||||
-if [ "$1" = '-fix-pkg-checksums' -o "$1" = '--fix-pkg-checksums' ]; then
|
||||
|
|
@ -368,7 +368,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = '-python' -o "$1" = '--python' ]; then
|
||||
shift
|
||||
if [ "$SAGE_PYTHON3" = 'yes' ]; then
|
||||
@@ -626,16 +379,6 @@ if [ "$1" = '-ipython3' -o "$1" = '--ipy
|
||||
@@ -631,16 +384,6 @@ if [ "$1" = '-ipython3' -o "$1" = '--ipy
|
||||
exec ipython3 "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -385,7 +385,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = '-sh' -o "$1" = '--sh' ]; then
|
||||
# AUTHORS:
|
||||
# - Carl Witty and William Stein: initial version
|
||||
@@ -755,20 +498,6 @@ EOF
|
||||
@@ -760,20 +503,6 @@ EOF
|
||||
fi
|
||||
|
||||
#####################################################################
|
||||
|
|
@ -406,7 +406,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
# File conversion
|
||||
#####################################################################
|
||||
|
||||
@@ -796,11 +525,6 @@ fi
|
||||
@@ -804,11 +533,6 @@ fi
|
||||
# Run Sage's versions of the standard Algebra/Geometry etc. software
|
||||
#####################################################################
|
||||
|
||||
|
|
@ -418,7 +418,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 "$@"
|
||||
@@ -811,13 +535,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
|
||||
@@ -819,13 +543,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
|
||||
exec sage-notebook "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -432,7 +432,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = "-inotebook" -o "$1" = '--inotebook' ]; then
|
||||
shift
|
||||
sage-cleaner &>/dev/null &
|
||||
@@ -836,34 +553,15 @@ if [ "$1" = '-grepdoc' -o "$1" = "--grep
|
||||
@@ -844,34 +561,15 @@ if [ "$1" = '-grepdoc' -o "$1" = "--grep
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
|
@ -469,7 +469,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
shift
|
||||
exec sage-runtests -p "$@"
|
||||
else
|
||||
@@ -872,10 +570,7 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
|
||||
@@ -880,10 +578,7 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -481,7 +481,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
shift
|
||||
sage_setup
|
||||
export PYTHONIOENCODING="utf-8" # Fix encoding for doctests
|
||||
@@ -896,122 +591,6 @@ if [ "$1" = '-c' ]; then
|
||||
@@ -904,122 +599,6 @@ if [ "$1" = '-c' ]; then
|
||||
exec sage-eval "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -604,7 +604,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = '-gdb' -o "$1" = "--gdb" ]; then
|
||||
shift
|
||||
sage_setup
|
||||
@@ -1061,12 +640,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
|
||||
@@ -1069,12 +648,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
|
||||
exec sage-callgrind "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -618,9 +618,9 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
exec sage-startuptime.py "$@"
|
||||
fi
|
||||
diff -up src/bin/sage-runtests.orig src/bin/sage-runtests
|
||||
--- src/bin/sage-runtests.orig 2018-08-03 05:10:08.000000000 -0600
|
||||
+++ src/bin/sage-runtests 2018-08-29 08:27:37.703807389 -0600
|
||||
@@ -67,10 +67,6 @@ if __name__ == "__main__":
|
||||
--- src/bin/sage-runtests.orig 2018-10-17 17:13:34.000000000 -0600
|
||||
+++ src/bin/sage-runtests 2018-10-24 15:19:11.805131334 -0600
|
||||
@@ -76,10 +76,6 @@ if __name__ == "__main__":
|
||||
help="run doctests using Valgrind's cachegrind tool. The log "
|
||||
"files are named sage-cachegrind.PID and can be found in " +
|
||||
os.path.join(DOT_SAGE, "valgrind"))
|
||||
|
|
@ -632,8 +632,8 @@ diff -up src/bin/sage-runtests.orig src/bin/sage-runtests
|
|||
parser.add_option("-f", "--failed", action="store_true", default=False,
|
||||
help="doctest only those files that failed in the previous run")
|
||||
diff -up src/bin/sage-valgrind.orig src/bin/sage-valgrind
|
||||
--- src/bin/sage-valgrind.orig 2018-08-03 05:10:08.000000000 -0600
|
||||
+++ src/bin/sage-valgrind 2018-08-29 08:27:37.703807389 -0600
|
||||
--- src/bin/sage-valgrind.orig 2018-10-17 17:13:34.000000000 -0600
|
||||
+++ src/bin/sage-valgrind 2018-10-24 15:19:11.805131334 -0600
|
||||
@@ -1,16 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue