Merge branch 'develop' of git://trac.sagemath.org/sage into t/24577/i…

…s_genus_for_torsion_quadratic_modules

VERSION.txt

@@ -1 +1 @@
-SageMath version 8.2.beta3, Release Date: 2018-01-17
+SageMath version 8.2.beta4, Release Date: 2018-01-27

build/bin/sage-spkg

@@ -21,6 +21,7 @@
 #      SAGE_ROOT      -- root directory of sage install
 #      SAGE_LOCAL     -- $SAGE_ROOT/local
 #      SAGE_DISTFILES -- directory that stores upstream tarballs
+#      SAGE_DESTDIR   -- temporary root the package will be installed to
 #      PKG_BASE       -- the base name of the package itself (e.g. 'patch')
 #      PKG_VER        -- the version number of the package
 #      PKG_NAME       -- $PKG_BASE-$PKG_VER
@@ -804,6 +805,10 @@ export rsync_proxy=$http_proxy
 # Actually install
 ##################################################################
 
+# Set the $SAGE_DESTDIR variable to be passed to the spkg-install
+# script (the script itself could set this, but better to standardize
+# this in one place)
+export SAGE_DESTDIR="${SAGE_BUILD_DIR}/${PKG_NAME}/inst"
 
 if [ -f spkg-build ]; then
     # Package has both spkg-build and spkg-install; execute the latter with SAGE_SUDO
@@ -826,6 +831,46 @@ else
     fi
 fi
 
+# All spkgs should eventually support this, but fall back on old behavior in
+# case DESTDIR=$SAGE_DESTDIR installation was not used
+echo "Copying package files from temporary location $SAGE_DESTDIR to $SAGE_LOCAL"
+if [ -d "$SAGE_DESTDIR" ]; then
+    PREFIX="${SAGE_DESTDIR}${SAGE_LOCAL%/}/"
+
+    rm -f "$PREFIX"lib/*.la
+    if [ $? -ne 0 ]; then
+        error_msg "Error deleting unnecessary libtool archive files"
+        exit 1
+    fi
+
+    # Generate installed file manifest
+    FILE_LIST=""
+    FIRST=1
+    IFS=$'\n'
+    for filename in $(find "$PREFIX" -type f -o -type l | sort); do
+        filename="${filename#$PREFIX}"
+        if [ $FIRST -eq 1 ]; then
+            FILE_LIST="\"$filename\""
+            FIRST=0
+        else
+            FILE_LIST="${FILE_LIST},"$'\n        '"\"${filename}\""
+        fi
+        # Copy file from the temp install path into $SAGE_LOCAL
+        if [ ! -d "$SAGE_LOCAL/$(dirname "$filename")" ]; then
+            mkdir -p "$SAGE_LOCAL/$(dirname "$filename")"
+        fi
+        mv "$PREFIX$filename" "${SAGE_LOCAL%/}/$filename"
+        if [ $? -ne 0 ]; then
+            error_msg "Error moving files for $PKG_BASE."
+            exit 1
+        fi
+    done
+
+    # Remove the $SAGE_DESTDIR entirely once all files have been moved to their
+    # final location.
+    rm -rf "$SAGE_DESTDIR"
+fi
+
 if [ "$UNAME" = "CYGWIN" ]; then
     # Rebase after installing each package--in case any packages load this
     # package at build time we need to ensure during the build that no binaries
@@ -834,7 +879,11 @@ if [ "$UNAME" = "CYGWIN" ]; then
         sage-rebase.sh "$SAGE_LOCAL" 2>/dev/null
 fi
 
-echo "Successfully installed $PKG_NAME"
+
+# Note: spkg-check tests are run after the package has been copied into
+# SAGE_LOCAL.  It might make more sense to run the tests before, but the
+# spkg-check scripts were written before use of DESTDIR installs, and so
+# fail in many cases.  This might be good to change later.
 
 if [ "$SAGE_CHECK" = "yes" ]; then
     if [ -f spkg-check ]; then
@@ -851,11 +900,6 @@ if [ "$SAGE_CHECK" = "yes" ]; then
     fi
 fi
 
-rm -f "$SAGE_LOCAL"/lib/*.la
-if [ $? -ne 0 ]; then
-    error_msg "Error deleting unnecessary libtool archive files"
-    exit 1
-fi
 
 # Mark that the new package has been installed (and tested, if
 # applicable).
@@ -867,11 +911,17 @@ cat > "$PKG_NAME_INSTALLED" << __EOF__
     "install_date": "$(date)",
     "system_uname": "$(uname -a)",
     "sage_version": "$(cat "${SAGE_ROOT}/VERSION.txt")",
-    "test_result": "$TEST_SUITE_RESULT"
+    "test_result": "$TEST_SUITE_RESULT",
+    "files": [
+        $FILE_LIST
+    ]
 }
 __EOF__
 
 
+echo "Successfully installed $PKG_NAME"
+
+
 ##################################################################
 # Delete the temporary build directory if required
 ##################################################################

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=fce3f8df178645228d91b6b65e3a03af0b2b3641
-md5=587c7e18518428f0f30138eeb7743bad
-cksum=144653522
+sha1=499badf9321c53c458652ca71580585463e574a3
+md5=e483eb587a1be5886b718e24f54a84a5
+cksum=3889320352

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-251
+252

build/pkgs/ecl/spkg-install

@@ -81,13 +81,13 @@ sdh_make_install
 # Create symbolic link to lib/ecl-version directory.
 # Also create a symbolic link lib/ecl/ecl -> include/ecl.
 # This is important when the Sage install is moved, see Trac #14662.
-cd "$SAGE_LOCAL/lib/" && rm -f ecl && ln -s ecl-* ecl
+cd "$SAGE_DESTDIR$SAGE_LOCAL/lib/" && rm -f ecl && ln -s ecl-* ecl
 if [ $? -ne 0 ]; then
     echo >&2 "Error - Failed to create symbolic link to ECL library"
     echo >&2 "directory ... exiting"
     exit 1
 fi
-cd "$SAGE_LOCAL/lib/ecl" && rm -f ecl && ln -s ../../include/ecl ecl
+cd "$SAGE_DESTDIR$SAGE_LOCAL/lib/ecl" && rm -f ecl && ln -s ../../include/ecl ecl
 if [ $? -ne 0 ]; then
     echo >&2 "Error - Failed to create symbolic link to ECL include"
     echo >&2 "directory ... exiting"

build/pkgs/gcc/spkg-install

@@ -123,8 +123,9 @@ $MAKE install
 
 
 # Force re-installation of gmp, mpir, mpfr and mpc with the GCC we just built.
+# Also mark gfortran as not installed.
 cd "$SAGE_SPKG_INST"
-rm -f gmp-* mpir-* mpfr-* mpc-*
+rm -f gmp-* mpir-* mpfr-* mpc-* gfortran-*
 
 # Force re-configuration: the next time that "make" is run, we don't
 # want GCC to be built again, see Trac #19324

build/pkgs/giac/checksums.ini

@@ -1,4 +1,4 @@
 tarball=giac-VERSION.tar.bz2
-sha1=79503a2c2ee1ffe996727d09ebe6c6be3554434c
-md5=ad15340533a7308f30b739bc36991a56
-cksum=2233538356
+sha1=3b61dd5fe79a76c2e0d4ef60ad1ad90dc3c04bd3
+md5=55308225758c547b061b52d699fa8b13
+cksum=2762392051

build/pkgs/giac/package-version.txt

@@ -1 +1 @@
-1.2.3.47.p1
+1.4.9.45

build/pkgs/giac/patches/README.txt

@@ -6,6 +6,3 @@
     (xcas, qcas). http://xcas.e.ujf-grenoble.fr/XCAS/viewtopic.php?f=4&t=1555.
     The macos-ifactor patch enables pari in ifactor under osx because the problem can't be 
     reproduced with the spkg library.
-
-*   the pari2.8 patch is because some outputs in the check suite differs when giac is built
-    with pari 2.8 vs 2.7. (One more keyword and a different ordering in a sum)

build/pkgs/giac/spkg-src

@@ -13,9 +13,8 @@ fi
 # Exit on failure
 set -e
 
-# TODO on the next update: l71 switch from gz to bz2 as wished in #18826
-VERSION="1.2.3"
-VERSIONREV="47"
+VERSION="1.4.9"
+VERSIONREV="45"
 
 # The upstream tarball name is: giac"$SOURCEORIG".tar.gz
 SOURCEORIG=_"$VERSION"-"$VERSIONREV"

build/pkgs/jupyter_client/checksums.ini

@@ -1,4 +1,4 @@
 tarball=jupyter_client-VERSION.tar.gz
-sha1=1f226cd2d437eed5f9c45d572c0c9efe53437ea9
-md5=990ab28f63861cc29f90585d3f725b10
-cksum=1587833857
+sha1=2290704671547049ee20b034135a7a191fbc26f1
+md5=03293d63b59a3f71c417ee907852b460
+cksum=3064225526

build/pkgs/jupyter_client/package-version.txt

@@ -1 +1 @@
-5.1.0
+5.2.2

build/pkgs/mpc/checksums.ini

@@ -1,4 +1,4 @@
 tarball=mpc-VERSION.tar.gz
-sha1=b8be66396c726fdc36ebb0f692ed8a8cca3bcc66
-md5=d6a1d5f8ddea3abd2cc3e98f58352d26
-cksum=1941630434
+sha1=b019d9e1d27ec5fb99497159d43a3164995de2d0
+md5=4125404e41e482ec68282a2e687f6c73
+cksum=3987925640

build/pkgs/mpc/package-version.txt

@@ -1 +1 @@
-1.0.3.p1
+1.1.0