Merge branch 'develop' into t/22090/gosper_algorithm

sagemath · Mar 24, 2017 · 6c1cec1 · 6c1cec1
2 parents f307a8a + d496ba4
commit 6c1cec1
Show file tree

Hide file tree

Showing 748 changed files with 13,849 additions and 7,502 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-SageMath version 7.6.beta5, Release Date: 2017-02-26
+SageMath version 7.6.rc2, Release Date: 2017-03-19
diff --git a/build/bin/sage-logger b/build/bin/sage-logger
@@ -60,14 +60,17 @@ else
     SED=cat
 fi
 
+# Store the current value of V, but do all logging of child processes
+# with V=1 to ensure that no information is lost.
+currentV=$V
+export V=1
+
 mkdir -p "$logdir"
 
-if [[ "$V" = 0 && $use_prefix = true ]]; then
+if [[ "$currentV" = 0 && $use_prefix = true ]]; then
     # Silent build.
     # Similar to https://www.gnu.org/software/automake/manual/html_node/Automake-Silent-Rules.html#Automake-Silent-Rules
     echo "[$logname] installing. Log file: $logfile"
-    # Use verbose mode for output to logfiles.
-    export V=1
     ( exec>> $logfile 2>&1 ; eval "$cmd" )
     status=$?
     if [[ $status != 0 ]]; then

diff --git a/build/make/deps b/build/make/deps
@@ -201,7 +201,7 @@ DOC_DEPENDENCIES = sagelib $(inst_sphinx) $(inst_sagenb) \
 	| $(SAGERUNTIME) $(inst_maxima) $(inst_networkx) $(inst_scipy) \
 	$(inst_matplotlib) $(inst_pillow) $(inst_mathjax) $(inst_mpmath) \
 	$(inst_ipykernel) $(inst_jupyter_client) $(inst_conway_polynomials) \
-	$(inst_tachyon) $(inst_jmol) $(inst_thebe)
+	$(inst_tachyon) $(inst_jmol) $(inst_thebe) $(inst_ipywidgets)
 
 doc: doc-html
 

diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=baa91f26fce5ea9c83a8749454342948e9a298d7
-md5=27f65dfa1e255f7f569353e49eba4968
-cksum=1946128373
+sha1=4d033e562fe03ebfe416f12411044e8cec4df94c
+md5=4822e231514b2e5f93f61fd078e2e4cc
+cksum=271749219
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-207
+211
diff --git a/build/pkgs/database_gap/dependencies b/build/pkgs/database_gap/dependencies
@@ -1,4 +1,4 @@
-gap | $(SAGERUNTIME)
+gap
 
 ----------
 All lines of this file are ignored except the first.

diff --git a/build/pkgs/database_gap/spkg-install b/build/pkgs/database_gap/spkg-install
@@ -54,6 +54,3 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 echo "Installed tomlib database."
-
-# sage -c "gap_reset_workspace()"
-
diff --git a/build/pkgs/gap3/spkg-install b/build/pkgs/gap3/spkg-install
@@ -20,7 +20,7 @@ echo "INSTALL_DIR = $INSTALL_DIR"
 ## INSTALLATION
 ###########################################
 
-cd src
+cd src/src
 $MAKE
 if [ $? -ne 0 ]; then
     echo >&2 "Error building $PACKAGE_SHORTNAME."

diff --git a/build/pkgs/gdb/spkg-install b/build/pkgs/gdb/spkg-install
@@ -8,7 +8,8 @@ fi
 
 cd src
 
-LDFLAGS="${LDFLAGS} -L${SAGE_LOCAL}/lib"
+# We add -ltinfo flag to let gdb compile on some 32bit VM, see #22487.
+LDFLAGS="${LDFLAGS} -L${SAGE_LOCAL}/lib -ltinfo"
 export LDFLAGS
 
 ./configure --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" \

diff --git a/build/pkgs/giac/checksums.ini b/build/pkgs/giac/checksums.ini
@@ -1,4 +1,4 @@
 tarball=giac-VERSION.tar.bz2
-sha1=363cdc60bf5522339aa89082d77580b6f43a6c0c
-md5=9af058745f57a374a0639633c98c4540
-cksum=2714101867
+sha1=8b94822f2b4a56c1d03813c92092204da4b087e1
+md5=aa481a59f17da298012d7c4cf0d58ab1
+cksum=1552927328
diff --git a/build/pkgs/giac/dependencies b/build/pkgs/giac/dependencies
@@ -1,4 +1,4 @@
-readline $(MP_LIBRARY) mpfr mpfi ntl gsl pari libpng
+readline $(MP_LIBRARY) mpfr mpfi ntl gsl pari
 
 ----------
 All lines of this file are ignored except the first.

diff --git a/build/pkgs/giac/package-version.txt b/build/pkgs/giac/package-version.txt
@@ -1 +1 @@
-1.2.2.103
+1.2.3.25
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		SageMath version 7.6.beta5, Release Date: 2017-02-26
		SageMath version 7.6.rc2, Release Date: 2017-03-19
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,6 +54,3 @@ if [ $? -ne 0 ]; then @@
         exit 1
     fi
     echo "Installed tomlib database."
-    # sage -c "gap_reset_workspace()"