Merge branch 'develop' into t/28562/better_zero_treatment_alternative

Author: Michael Jung

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.0.beta0, Release Date: 2019-10-05
+SageMath version 9.0.beta1, Release Date: 2019-10-12

build/pkgs/4ti2/spkg-install

@@ -1,7 +1,7 @@
 cd src/
 CFLAGS="-I $SAGE_LOCAL/include -L$SAGE_LOCAL/lib $CFLAGS"
 export CFLAGS
-sdh_configure $SAGE_CONFIGURE_GMP --with-glpk=$SAGE_LOCAL \
+sdh_configure $SAGE_CONFIGURE_GMP --with-glpk=$SAGE_GLPK_PREFIX \
     --enable-shared=yes --enable-static=no
 sdh_make
 sdh_make_install

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=88c64d8e89617f7b817b4c64c86f178bb3492197
-md5=8597ab2ea667727bac68a2d0dad07fab
-cksum=1280714849
+sha1=45c345451205b59bc031257b5627894d175834ef
+md5=d336cd88b91401385249853e2c740cc4
+cksum=1565445122

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-34c16c3013c6f6d041875509edc8fb6bb84f4d3c
+58fd34e0b757b9310e87cd5f006bf63dfd43ce19

build/pkgs/giacpy_sage/checksums.ini

@@ -1,4 +1,4 @@
 tarball=giacpy_sage-VERSION.tar.gz
-sha1=f23909396c6464c7b8a05538ced73ba34152c7bf
-md5=9d250194dc1c7c0ea391e36e3f7a07e2
-cksum=2377016266
+sha1=3227503e88e65ef3a05b27647b5279fedc988569
+md5=41c5a32ea525d6a2a7de4cee8693e1f1
+cksum=4142736489

build/pkgs/giacpy_sage/package-version.txt

@@ -1 +1 @@
-0.6.7
+0.6.8

build/pkgs/glpk/spkg-configure.m4

@@ -0,0 +1,25 @@
+SAGE_SPKG_CONFIGURE([glpk], [
+    m4_pushdef([SAGE_GLPK_MINVER],["4.63"])
+    SAGE_SPKG_DEPCHECK([gmp mpir zlib], [
+        AC_PATH_PROG([GLPSOL], [glpsol])
+        AS_IF([test x$GLPSOL = x], [
+           AC_MSG_NOTICE([glpsol not found. Installing glpk])
+           sage_spkg_install_glpk=yes], [
+           glpk_ver=`$GLPSOL --version | grep ^GLPSOL | $SED -e 's/GLPSOL.*ver, v//g' 2>> config.log`
+           AX_COMPARE_VERSION([$glpk_ver], [ge], [$SAGE_GLPK_MINVER], [
+               AC_CHECK_HEADER([glpk.h], [], [sage_spkg_install_glpk=yes])
+               AC_SEARCH_LIBS([glp_config], [glpk],
+                  [AC_MSG_RESULT([yes. Use system's glpk])], [
+                  AC_MSG_RESULT([no. Install glpk])
+                  sage_spkg_install_glpk=yes])dnl end-AC_SEARCH_LIBS
+                  ], [sage_spkg_install_glpk=yes])dnl end-AX_COMPARE_VERSION
+         ])dnl end-AS_IF
+    ])
+    m4_popdef([SAGE_GLPK_MINVER])
+], [], [], [
+    AS_IF([test x$sage_spkg_install_glpk = xyes], [
+        AC_SUBST(SAGE_GLPK_PREFIX, ['$SAGE_LOCAL'])
+        AC_MSG_RESULT([using Sage's glpk SPKG])], [
+        AC_SUBST(SAGE_GLPK_PREFIX, [''])
+        AC_MSG_RESULT([using glpk from the system])])
+])

build/pkgs/sqlite/checksums.ini

@@ -1,4 +1,4 @@
 tarball=sqlite-autoconf-VERSION.tar.gz
-sha1=6cdb46a153b0e88f8a5fd80e29b3966885f39ea4
-md5=cb72c5f93235cd56b18ee2aa1504cdaf
-cksum=1443188914
+sha1=053d8237eb9741b0e297073810668c2611a8e38e
+md5=8f3dfe83387e62ecb91c7c5c09c688dc
+cksum=1918823569

build/pkgs/sqlite/package-version.txt

@@ -1 +1 @@
-3270100
+3290000

src/bin/sage-env-config.in

@@ -99,6 +99,7 @@ if [ -n "$SAGE_PARI_PREFIX" ]; then
 fi
 export SAGE_PARI_CFG="@SAGE_PARI_CFG@"
 
+export SAGE_GLPK_PREFIX="@SAGE_GLPK_PREFIX@"
 export SAGE_FREETYPE_PREFIX="@SAGE_FREETYPE_PREFIX@"
 export SAGE_ARB_LIBRARY="@SAGE_ARB_LIBRARY@"