Merge branch 'u/jdemeyer/no-sage64' into u/embray/build/destdir-curl-gc

Conflicts:
	build/pkgs/gc/spkg-install

Author: embray

VERSION.txt

@@ -1 +1 @@
-SageMath version 8.2.beta8, Release Date: 2018-03-10
+SageMath version 8.2.rc0, Release Date: 2018-03-28

build/bin/sage-spkg

@@ -801,6 +801,26 @@ export https_proxy=$http_proxy
 export ftp_proxy=$http_proxy
 export rsync_proxy=$http_proxy
 
+##################################################################
+# We need to run sage-rebase.sh for each package installed, but it
+# can be dangerous to do this while other packages are installing
+# so we need to use a lock to manage when rebase is allowed to
+# run.  Because of this, if multiple sage-spkg runs are waiting on
+# the rebase lock, we can end up with multiple consecutive rebase
+# calls that are redundant, but I don't see an obvious way around
+# that.  This also unfortunately slows down parallel builds since
+# all packages will eventually need to wait for this lock, but
+# again there's no simple way around that.
+##################################################################
+
+if [ "$UNAME" = "CYGWIN" ]; then
+    if [ ! -d "$SAGE_LOCAL/var/lock" ]; then
+        mkdir -p "$SAGE_LOCAL/var/lock"
+    fi
+    exec 200>"$SAGE_LOCAL/var/lock/rebase.lock"
+    sage-flock -s $lock_type 200
+fi
+
 ##################################################################
 # Actually install
 ##################################################################
@@ -810,6 +830,13 @@ export rsync_proxy=$http_proxy
 # this in one place)
 export SAGE_DESTDIR="${SAGE_BUILD_DIR}/${PKG_NAME}/inst"
 
+# The actual prefix where the installation will be staged. This is the
+# directory that you need to work in if you want to change the staged
+# installation tree (before final installation to $SAGE_LOCAL) at the
+# end of spkg-install.
+export SAGE_DESTDIR_LOCAL="${SAGE_DESTDIR}${SAGE_LOCAL}"
+
+
 if [ -f spkg-build ]; then
     # Package has both spkg-build and spkg-install; execute the latter with SAGE_SUDO
     time ./spkg-build
@@ -835,7 +862,7 @@ fi
 # 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%/}/"
+    PREFIX="${SAGE_DESTDIR_LOCAL%/}/"
 
     rm -f "$PREFIX"lib/*.la
     if [ $? -ne 0 ]; then
@@ -872,9 +899,14 @@ if [ -d "$SAGE_DESTDIR" ]; then
 fi
 
 if [ "$UNAME" = "CYGWIN" ]; then
+    # Drop our sage-spkg's shared lock, and try to call sage-rebase.sh
+    # under an exclusive lock
+    sage-flock -u 200
+
     # 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
     # have conflicting address spaces
+    echo "Waiting for rebase lock"
     sage-flock -x "$SAGE_LOCAL/var/lock/rebase.lock" \
         sage-rebase.sh "$SAGE_LOCAL" 2>/dev/null
 fi

build/make/Makefile.in

@@ -125,11 +125,15 @@ $(INST)/.dummy:
 #
 #     $(inst_python2) $(inst_cython) $(inst_pari) | $(inst_pip)
 #
+# If some value in the dependencies list is not a package name (e.g. it is
+# the name of some arbitrary file, or it is the '|' symbol) then it is just
+# used verbatim.
+#
 # Positional arguments:
 #     $(1): package name
 pkg_deps = \
 	$(foreach dep,$(deps_$(1)),\
-        $(if $(findstring |,$(dep)),|,$$(inst_$(dep))))
+        $(if $(value inst_$(dep)),$$(inst_$(dep)),$(dep)))
 
 # ============================= normal packages ==============================
 # Generate build rules for 'normal' packages; this template is used to generate

build/pkgs/atlas/configuration.py

@@ -169,13 +169,8 @@ def close(self):
 
 conf['bits'] = platform.architecture()[0]
 
-if os.environ.get('SAGE64', 'no') == 'yes':
-    assert conf['bits'] == '64bit', 'SAGE64=yes on a 32-bit system!'
-    conf['64bit?'] = True
-else:
-    conf['64bit?'] = (conf['bits'] == '64bit')
-
-conf['32bit?'] = not conf['64bit?']
+conf['64bit?'] = (conf['bits'] == '64bit')
+conf['32bit?'] = (conf['bits'] != '64bit')
 
 
 ######################################################################

build/pkgs/bzip2/spkg-install

@@ -1,14 +1,3 @@
-if [ "x$CFLAG64" = x ]; then
-    CFLAG64=-m64
-fi
-
-if [ "x$SAGE64" = xyes ]; then
-    echo "Building a 64-bit version of bzip2"
-    CFLAGS="$CFLAG64 $CFLAGS"
-fi
-
-export CFLAGS="-O2 -g $CFLAGS"
-
 cd src/src
 
 # Autotoolify bzip2

build/pkgs/cddlib/spkg-install

@@ -1,16 +1,3 @@
-# Normally for a 64-bit build, the -m64 option is added to
-# gcc, but other compilers will not accept that, so
-# allow it to be configured as something different if need
-# be.
-
-if [ -z $CFLAG64 ] ; then
-    CFLAG64=-m64
-fi
-
-if [ "x$SAGE64" = xyes ]; then
-    echo "64 bit build of cddlib"
-    CFLAGS="$CFLAGS $CFLAG64"; export CFLAGS
-fi
 export CPPFLAGS="-I$SAGE_LOCAL/include $CPPFLAGS"
 
 cd src

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=da31bee34bb5f75c85af4af3479783c061a357a2
-md5=310a850d0a886892a777570bca9333f9
-cksum=3849795753
+sha1=ff196b4e199d9c2416a8237be639a0c51cfe4981
+md5=370515e0f9f514249680f78c029e4583
+cksum=2628178955

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-256
+257

build/pkgs/cvxopt/spkg-check

@@ -6,26 +6,6 @@ fi
 
 CUR=`pwd`
 
-# Let the user set an environment variable CFLAG64 to
-# indicate the C compiler flag for 64-bit builds. By
-# default this will be -m64. IBM's compiler on AIX
-# and HP's on HP-UX do NOT use -m64.
-
-if [ -z "$CFLAG64" ] ; then
-    CFLAG64=-m64
-fi
-
-# There is no C++ code in cvxopt, so no need to do likewise
-# with CXXFLAG64.
-
-if [ "x$SAGE64" = xyes ]; then
-    echo "Testing a 64-bit version of the cvxopt"
-    CFLAGS="$CFLAGS $CFLAG64"
-    CPPFLAGS="$CPPFLAGS $CFLAG64" ; export CPPFLAGS
-    LDFLAGS="$LDFLAGS $CFLAG64" ; export LDFLAGS
-    CC="$CC $CFLAG64" ; export CC
-fi
-
 if [ "x$SAGE_DEBUG" = xyes ] ; then
     CFLAGS="$CFLAGS -g -O0" # No optimisation, aids debugging.
 else

build/pkgs/cvxopt/spkg-install

@@ -6,21 +6,6 @@ fi
 
 cd src
 
-# Normally for a 64-bit build the -m64 option is added to
-# gcc, but other compilers will not accept that, so
-# allow it to be configured as something different if need
-# be.
-
-if [ -z $CFLAG64 ] ; then
-   CFLAG64=-m64
-fi
-
-if [ "x$SAGE64" = xyes ]; then
-   echo "Building a 64 bit version of cvxopt"
-   CFLAGS="$CFLAGS $CFLAG64"; export CFLAGS
-   CC="$CC $CFLAG64" ; export CC
-fi
-
 # Ensure FreeBSD build finds new, local math.h and complex.h
 if [ "$UNAME" = FreeBSD ]; then
     export CPPFLAGS="$CPPFLAGS -I$SAGE_LOCAL/include"