Merge branch 'public/topology/zariski_van_kampen_plane_curves-21045' …

…of git://trac.sagemath.org/sage into t/21045/implement_zariski_vankampen_method_to_compute_fundamental_groups_of_complements_of_plane_curves_

VERSION.txt

@@ -1 +1 @@
-SageMath version 8.0.beta1, Release Date: 2017-04-06
+SageMath version 8.0.beta2, Release Date: 2017-04-12

build/pkgs/brial/checksums.ini

@@ -1,4 +1,4 @@
 tarball=brial-VERSION.tar.bz2
-sha1=12ef021fc1236e25ff0b46680720918489fb4931
-md5=f332eaa0378e9b630f958e4dcd4ea6e8
-cksum=2509320148
+sha1=7e6b7a625773da78cefda241dc016f242da27d7f
+md5=449858d7e7f918066eb9224d903cd8f6
+cksum=2006315550

build/pkgs/brial/package-version.txt

@@ -1 +1 @@
-0.8.5
+0.8.7

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=461f156646483261f665ac9978a29c6224e2a20f
-md5=45c477ceae69c8fbd7ea7e6de4a3d5aa
-cksum=1746482096
+sha1=8bdfb4b87a803b90d6b9a937d961835955723a09
+md5=1f1aa69a7ac98e4443e82611a3bbea23
+cksum=4121821509

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-215
+216

build/pkgs/functools32/spkg-install

@@ -6,7 +6,7 @@ if [ -z "$SAGE_LOCAL" ]; then
     exit 1
 fi
 
-if [ -n -x "$SAGE_LOCAL/bin/python2" ]; then
+if [ "$SAGE_PYTHON3" = yes ]; then
     echo "Skipping functools32 since it is not necessary on Python 3"
     exit 0
 fi

build/pkgs/libgap/spkg-check

@@ -1,6 +1,12 @@
 #!/usr/bin/env bash
 
+# location of the corresponding gap installation
+# it is only used by the test suite
+# it cannot be moved to spkg-install as it can interfere
+# with proper detection of PIC flags, notably with clang
+# see #22784
+CPPFLAGS="$CPPFLAGS"' -DSYS_DEFAULT_PATHS=\"'"$SAGE_LOCAL/gap/latest"'\"'
 
 cd src
-make check
+make check CPPFLAGS="$CPPFLAGS"
 

build/pkgs/libgap/spkg-install

@@ -24,10 +24,6 @@ fi
 source "$SAGE_LOCAL/gap/latest/sysinfo.gap"
 echo "GAP was configured with $GAParch_system"
 
-# location of the corresponding gap installation
-# only used for the testsuite
-CPPFLAGS="$CPPFLAGS"' -DSYS_DEFAULT_PATHS=\"'"$SAGE_LOCAL/gap/latest"'\"'
-
 cd src
 
 echo "Configuring libGAP..."

build/pkgs/libgd/spkg-install

@@ -13,11 +13,6 @@ rm "$SAGE_LOCAL"/lib/libgd.*
 
 cd src
 
-# Needed to correctly pickup libiconv on FreeBSD
-if [ "$UNAME" = "FreeBSD" ] ; then
-   LDFLAGS="-L/usr/local/lib $LDFLAGS"
-fi
-
 if [ "$SAGE64" = "yes" ]; then
    CFLAGS=" -m64 -g $CFLAGS"
    LDFLAGS="-m64 $LDFLAGS"

build/pkgs/linbox/package-version.txt

@@ -1 +1 @@
-1.4.2
+1.4.2.p0

build/pkgs/linbox/patches/linbox-PR50.patch

@@ -0,0 +1,52 @@
+From e6f686d73778bbc7850df74dd0e14f8707fa845f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= <francois.bissey@canterbury.ac.nz>
+Date: Thu, 6 Apr 2017 10:29:40 +1200
+Subject: [PATCH] Simplification in gf2.h headers. Be more standard conformant
+
+---
+ linbox/field/gf2.h | 24 +-----------------------
+ 1 file changed, 1 insertion(+), 23 deletions(-)
+
+diff --git a/linbox/field/gf2.h b/linbox/field/gf2.h
+index 08c14fd..8afc33c 100644
+--- a/linbox/field/gf2.h
++++ b/linbox/field/gf2.h
+@@ -41,11 +41,7 @@
+ #include "linbox/field/field-traits.h"
+ // #include "linbox/vector/vector-domain.h"
+
+-#if !defined(__PATHCC__) && !(defined(__APPLE__) && defined(__clang__))
+-#define stdBitReference std::_Bit_reference
+-#else
+ #define stdBitReference std::vector<bool>::reference
+-#endif
+
+ // Namespace in which all LinBox code resides
+ namespace LinBox
+@@ -1015,25 +1011,7 @@ namespace LinBox
+ // Specialization of homomorphism for basefield
+ #include "linbox/randiter/gf2.h"
+
+-#if __cplusplus >= 201103L
+-#if defined( __APPLE__) && defined(__clang__)
+-#include <__bit_reference>
+-#else
+-#include <bits/stl_bvector.h>
+-#endif /* __clang__ */
+-#else
+-// #include <bits/stl_bvector.h>
+-{
+-	//! @todo JGD 05.11.2009 : it should be in bits/stl_bvector.h  ...
+-	inline void swap(stdBitReference __x, stdBitReference __y)
+-	{
+-		bool __tmp = __x;
+-		__x = __y;
+-		__y = __tmp;
+-	}
+-}
+-#endif
+-
++#include <vector>
+
+ #include "linbox/field/gf2.inl"
+

build/pkgs/matplotlib/make-setup-config.py

@@ -30,5 +30,5 @@
 for backend in ('gtk', 'gtkagg', 'tkagg', 'wxagg', 'macosx', 'windowing'):
     config.set('gui_support', backend,  graphical_backend)
 
-with open('src/setup.cfg', 'wb') as configfile:
+with open('src/setup.cfg', 'w') as configfile:
     config.write(configfile)

build/pkgs/numpy/spkg-install

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-CUR=`pwd`
-
 if [ -z "$SAGE_LOCAL" ]; then
    echo "SAGE_LOCAL undefined ... exiting"
    echo "Maybe run 'sage -sh'?"
@@ -34,7 +32,7 @@ else
     export LDFLAGS="${LDFLAGS} -shared"
 fi
 
-python "${CUR}"/lapack_conf.py
+python ../lapack_conf.py
 
 # Make sure that the fortran objects are compiled with -fPIC
 export FFLAGS="$FFLAGS -fPIC"
@@ -44,10 +42,7 @@ export NUMPY_FCONFIG="config_fc --noopt --noarch"
 
 ################################################
 
-rm -rf "$SAGE_LOCAL/lib/python/site-packages/numpy"
-
-# Program around a bug in SciPY's distutils.
-unset CFLAGS
+rm -rf "$SAGE_LOCAL/lib/python*/site-packages/numpy"
 
 python setup.py \
         --no-user-cfg \