Merge tag '9.4.rc1' into t/32046/use_pip___use_feature_in_tree_build_…

…_replace_use_of_sdh_setup_bdist_wheel_by_sdh_pip_install

SageMath version 9.4.rc1, Release Date: 2021-08-08

.zenodo.json

@@ -1,10 +1,10 @@
 {
     "description": "Mirror of the Sage https://sagemath.org/ source tree", 
     "license": "other-open", 
-    "title": "sagemath/sage: 9.4.beta6", 
-    "version": "9.4.beta6", 
+    "title": "sagemath/sage: 9.4.rc1", 
+    "version": "9.4.rc1", 
     "upload_type": "software", 
-    "publication_date": "2021-07-24", 
+    "publication_date": "2021-08-08", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/9.4.beta6", 
+            "identifier": "https://github.com/sagemath/sage/tree/9.4.rc1", 
             "relation": "isSupplementTo"
         }, 
         {

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.4.beta6, Release Date: 2021-07-24
+SageMath version 9.4.rc1, Release Date: 2021-08-08

build/pkgs/cmake/checksums.ini

@@ -1,5 +1,5 @@
 tarball=cmake-VERSION.tar.gz
-sha1=3728308244166d6ed0a390d12d690d77fd2cc987
-md5=6f864e620ddf9f01dda37d7fe73667f2
-cksum=3738844955
+sha1=abbeedb49c153be4103eabc95f4ffd94440f4d61
+md5=f616604606184e3c7b870a57e68a7c3b
+cksum=2102786355
 upstream_url=https://github.com/Kitware/CMake/releases/download/vVERSION/cmake-VERSION.tar.gz

build/pkgs/cmake/distros/alpine.txt

@@ -0,0 +1 @@
+cmake

build/pkgs/cmake/distros/arch.txt

@@ -0,0 +1 @@
+cmake

build/pkgs/cmake/distros/gentoo.txt

@@ -0,0 +1 @@
+dev-util/cmake

build/pkgs/cmake/distros/nix.txt

@@ -0,0 +1 @@
+cmake

build/pkgs/cmake/package-version.txt

@@ -1 +1 @@
-3.19.3
+3.21.0

build/pkgs/cmake/spkg-configure.m4

@@ -7,6 +7,7 @@ SAGE_SPKG_CONFIGURE(
             AS_IF([test -n "$cmake_version"], [
                 AX_COMPARE_VERSION([$cmake_version], [ge], [3.4], [
                     ac_cv_path_CMAKE="$ac_path_CMAKE"
+                    ac_path_CMAKE_found=:
                 ])
             ])
         ])

build/pkgs/cmake/type

@@ -1 +1 @@
-optional
+standard

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=c55867da552d5ed30328a35a480dc1ab14ec232c
-md5=5cbace690cae40b89993e3a71fe4200c
-cksum=912186647
+sha1=d0bd7eea48134f0698b2fa53a51ab07fc6ec488d
+md5=1417fa63769b87988e6d4e3d1a8c7580
+cksum=4077581907

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-25ff4f4daf3cd93053f7b8c1e39117ce67e96b6c
+952f7f9006c84ef54ce7b5aa8e908cc5ea9379bf

build/pkgs/csdp/SPKG.rst

@@ -28,7 +28,7 @@ Special Update/Build Instructions
 
 csdp is an autotool'ed version of CSDP, see
 https://projects.coin-or.org/Csdp, developed in its own repository at
-http://github.org/dimpase/csdp.
+https://github.com/dimpase/csdp.
 
 To update to a new version, you need to bump the version number in
 configure.ac and rerun autotools (autoreconf -fiv). Any changes should

build/pkgs/csdp/package-version.txt

@@ -1 +1 @@
-6.2.p0
+6.2.p1

build/pkgs/csdp/patches/c99.patch

@@ -0,0 +1,52 @@
+diff --git a/lib/easysdp.c b/lib/easysdp.c
+index af22a8d..7a4d137 100644
+--- a/lib/easysdp.c
++++ b/lib/easysdp.c
+@@ -12,6 +12,9 @@
+ #include <math.h>
+ #include <csdp/declarations.h>
+
++int checkc(int, struct blockmatrix, int);
++int checkconstraints(int, int, struct blockmatrix, struct constraintmatrix *, int);
++
+ int easy_sdp(n,k,C,a,constraints,constant_offset,pX,py,pZ,ppobj,pdobj)
+      int n;
+      int k;
+@@ -65,7 +68,7 @@ int easy_sdp(n,k,C,a,constraints,constant_offset,pX,py,pZ,ppobj,pdobj)
+   struct sparseblock *q;
+   struct sparseblock *prev=NULL;
+   double gap;
+-  int nnz;
++  int nnz, res;
+
+    /*
+     *  Initialize the parameters.
+@@ -433,13 +436,13 @@ int easy_sdp(n,k,C,a,constraints,constant_offset,pX,py,pZ,ppobj,pdobj)
+     * Check the symmetry of C.
+     */
+
+-   checkc(n,C,printlevel);
++   res=checkc(n,C,printlevel);
+
+    /*
+     * Check constraints.
+     */
+
+-   checkconstraints(n,k,C,constraints,printlevel);
++   res=checkconstraints(n,k,C,constraints,printlevel);
+
+    /*
+     *  Now, call sdp().
+@@ -737,11 +740,7 @@ int checkc(int n,struct blockmatrix C,int printlevel)
+  * Sanity tests on the constraints data structure.
+  */
+
+-int checkconstraints(n,k,C,constraints,printlevel)
+-     int n;
+-     int k;
+-     struct blockmatrix C;
+-     struct constraintmatrix *constraints;
++int checkconstraints(int n, int k, struct blockmatrix C, struct constraintmatrix *constraints, int printlevel)
+ {
+   int i,j;
+   struct sparseblock *p;

build/pkgs/curl/spkg-configure.m4

@@ -3,7 +3,9 @@ SAGE_SPKG_CONFIGURE([curl], [
     # later, since that is what R needs.
     AC_CACHE_CHECK([for curl 7.22], [ac_cv_path_CURL], [
         AC_PATH_PROGS_FEATURE_CHECK([CURL], [curl], [
-          ${ac_path_CURL}-config --checkfor 7.22 >/dev/null 2>/dev/null && ac_cv_path_CURL=${ac_path_CURL}
+          ${ac_path_CURL}-config --checkfor 7.22 >/dev/null 2>/dev/null &&
+                    ac_cv_path_CURL=${ac_path_CURL} &&
+                    ac_path_CURL_found=:
         ])
     ])
     AS_IF([test -z "$ac_cv_path_CURL"], [sage_spkg_install_curl=yes])

build/pkgs/gap/SPKG.rst

@@ -22,10 +22,9 @@ architecture-independent, are in a separate package.
 Upstream Contact
 ----------------
 
-http://www.gap-system.org
+https://www.gap-system.org
 
-David Joyner, [email protected] (on the GAP team, but Steve Linton,
-[email protected], is basically the lead developer)
+Mailing list at https://mail.gap-system.org/mailman/listinfo/gap
 
 Dependencies
 ------------

build/pkgs/gap_packages/SPKG.rst

@@ -5,15 +5,13 @@ Description
 -----------
 
 Several "official" and "undeposited" GAP packages available from
-http://www.gap-system.org/Packages/packages.html
+https://www.gap-system.org/Packages/packages.html
 
 
 Upstream Contact
 ----------------
 
--  Dmitrii Pasechnik, [email protected]
--  David Joyner, [email protected] (on the GAP team)
--  Steve Linton, [email protected] (basically the GAP lead developer)
+Mailing list at https://mail.gap-system.org/mailman/listinfo/gap
 
 Dependencies
 ------------

build/pkgs/gcc/spkg-configure.m4

@@ -108,21 +108,14 @@ SAGE_SPKG_CONFIGURE_BASE([gcc], [
     fi
     AC_SUBST(CXX)
 
-    AC_LANG_PUSH(C)
     if test -z "$CC"; then
         SAGE_MUST_INSTALL_GCC([a C compiler is missing])
     fi
 
-    # Save compiler before checking for C99 support
-    save_CC=$CC
-    # Check that we can compile C99 code
-    AC_PROG_CC_C99()
+    # Check for C99 support detected by the AC_PROG_CC macro.
     if test "x$ac_cv_prog_cc_c99" = xno; then
         SAGE_MUST_INSTALL_GCC([your C compiler cannot compile C99 code])
     fi
-    # restore original CC
-    CC=$save_CC
-    AC_LANG_POP()
 
     if test x$GXX != xyes; then
         SAGE_SHOULD_INSTALL_GCC([your C++ compiler isn't GCC (GNU C++)])

build/pkgs/gfan/spkg-configure.m4

@@ -6,6 +6,7 @@ SAGE_SPKG_CONFIGURE(
             AS_IF([test -n "$gfan_version"], [
                 AX_COMPARE_VERSION([$gfan_version], [ge], [0.6.2], [
                     ac_cv_path_GFAN_VERSION="$ac_path_GFAN_VERSION"
+                    ac_path_GFAN_VERSION_found=:
                 ])
             ])
         ])

build/pkgs/giac/spkg-configure.m4

@@ -10,6 +10,7 @@ SAGE_SPKG_CONFIGURE([giac], [
                 AX_COMPARE_VERSION([$giac_version], [ge], GIAC_MIN_VERSION, [
                     AX_COMPARE_VERSION([$giac_version], [le], GIAC_MAX_VERSION, [
                         ac_cv_path_GIAC="$ac_path_GIAC"
+                        ac_path_GIAC_found=:
                     ])
                 ])
             ])

build/pkgs/git/spkg-configure.m4

@@ -2,6 +2,9 @@ SAGE_SPKG_CONFIGURE([git], [
     # Check whether git works by executing "git --version"
 	AC_CACHE_CHECK([for git], [ac_cv_path_GIT], [
 		AC_PATH_PROGS_FEATURE_CHECK([GIT], [git],
-		[${ac_path_GIT} --version >/dev/null 2>/dev/null && ac_cv_path_GIT=${ac_path_GIT}],
+		[${ac_path_GIT} --version >/dev/null 2>/dev/null &&
+                      ac_cv_path_GIT=${ac_path_GIT} &&
+                      ac_path_GIT_found=:
+                ],
 		[sage_spkg_install_git=yes; ac_cv_path_GIT=no])])
 ])

build/pkgs/ninja_build/spkg-configure.m4

@@ -7,6 +7,7 @@ SAGE_SPKG_CONFIGURE(
             AS_IF([test -n "$ninja_version"], [
                 AX_COMPARE_VERSION([$ninja_version], [ge], [1.7.2], [
                     ac_cv_path_NINJA="$ac_path_NINJA"
+                    ac_path_NINJA_found=:
                 ])
             ])
         ])

build/pkgs/numpy/spkg-install.in

@@ -27,9 +27,14 @@ export FCFLAGS="$FCFLAGS -fPIC"
 export CFLAGS="$CFLAGS_NON_NATIVE"
 
 export NUMPY_FCONFIG="config_fc --noopt --noarch"
+if [ "$SAGE_FAT_BINARY" = "yes" ]; then
+    export NUMPY_FCONFIG="--cpu-baseline=NONE"
+else
+    export NUMPY_FCONFIG
+fi
 
 ################################################
 
-sdh_setup_bdist_wheel ${NUMPY_FCONFIG}
+sdh_setup_bdist_wheel build ${NUMPY_CONFIG} ${NUMPY_FCONFIG}
 
 sdh_store_and_pip_install_wheel .

build/pkgs/patch/spkg-configure.m4

@@ -7,6 +7,7 @@ SAGE_SPKG_CONFIGURE(
             AS_IF([test -n "$patch_version"], [
                 AX_COMPARE_VERSION([$patch_version], [ge], [2.7.0], [
                     ac_cv_path_PATCH="$ac_path_PATCH"
+                    ac_path_PATCH_found=:
                 ])
             ])
         ])

build/pkgs/sagelib/package-version.txt

@@ -1 +1 @@
-9.4.beta6
+9.4.rc1

build/pkgs/tox/spkg-configure.m4

@@ -9,6 +9,7 @@ SAGE_SPKG_CONFIGURE([tox], [
             AS_IF([test -n "$tox_version"], [
                 AX_COMPARE_VERSION([$tox_version], [ge], TOX_MIN_VERSION, [
                     ac_cv_path_TOX="$ac_path_TOX"
+                    ac_path_TOX_found=:
                 ])
             ])
          ])

build/pkgs/xz/spkg-configure.m4

@@ -8,6 +8,7 @@ SAGE_SPKG_CONFIGURE([xz], [
               AS_IF([test -n "$xz_version"], [
                   AX_COMPARE_VERSION([$xz_version], [ge], [4.999.0], [
                       ac_cv_path_XZ="$ac_path_XZ"
+                      ac_path_XZ_found=:
                   ])
               ])
             ])

build/pkgs/yasm/spkg-configure.m4

@@ -4,7 +4,10 @@ SAGE_SPKG_CONFIGURE(
     # must support "adox" (new Skylake instruction)
     [AC_MSG_CHECKING([for yasm supporting the adox instruction])
      AC_PATH_PROGS_FEATURE_CHECK([YASM], [yasm],
-        [[{ echo "BITS 64"; echo "adox rax, rax"; } | ${ac_path_YASM} - -o /dev/null >/dev/null 2>/dev/null && ac_cv_path_YASM=${ac_path_YASM}]],
+        [[{ echo "BITS 64"; echo "adox rax, rax"; } | ${ac_path_YASM} - -o /dev/null >/dev/null 2>/dev/null &&
+                ac_cv_path_YASM=${ac_path_YASM} &&
+                ac_path_YASM_found=:
+        ]],
         [sage_spkg_install_yasm=yes; ac_cv_path_YASM=no])
      AC_MSG_RESULT($ac_cv_path_YASM)],
     [dnl REQUIRED-CHECK

m4/ax_absolute_header.m4

@@ -27,7 +27,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 7
+#serial 8
 
 dnl Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -40,7 +40,7 @@ dnl Modified by Rhys Ulerich to use AC_CHECK_HEADERS instead of _ONCE
 AU_ALIAS([GL_TRILINOS_ABSOLUTE_HEADER], [AX_ABSOLUTE_HEADER])
 AC_DEFUN([AX_ABSOLUTE_HEADER],
 [AC_LANG_PREPROC_REQUIRE()dnl
-AC_FOREACH([gl_HEADER_NAME], [$1],
+m4_foreach_w([gl_HEADER_NAME], [$1],
   [AS_VAR_PUSHDEF([gl_absolute_header],
                   [gl_cv_absolute_]m4_quote(m4_defn([gl_HEADER_NAME])))dnl
   AC_CACHE_CHECK([absolute name of <]m4_quote(m4_defn([gl_HEADER_NAME]))[>],

m4/ppl.m4

@@ -106,7 +106,7 @@ dnl (Also sanity checks the results of ppl-config to some extent.)
     AC_LANG_PUSH(C++)
 
     rm -f conf.ppltest
-    AC_TRY_RUN([
+    AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <ppl.hh>
 #include <iostream>
 #include <cstdio>
@@ -232,7 +232,7 @@ main() {
   }
   return 0;
 }
-],, no_ppl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+]])],[],[no_ppl=yes],[echo $ac_n "cross compiling; assumed OK... $ac_c"])
 
     AC_LANG_POP
 
@@ -261,15 +261,13 @@ else
       echo "*** Could not run PPL test program, checking why..."
       CPPFLAGS="$CPPFLAGS $PPL_CPPFLAGS"
       LIBS="$LIBS $PPL_LIBS"
-      AC_TRY_LINK([
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <ppl.hh>
 using namespace Parma_Polyhedra_Library;
-],
-[
+]], [[
   return version_major() || version_minor()
   || version_revision() || version_beta();
-],
-[
+]])],[
   echo "*** The test program compiled, but did not run.  This usually means"
   echo "*** that the run-time linker is not finding the PPL or finding the"
   echo "*** wrong version of the PPL.  If it is not finding the PPL, you will"
@@ -280,8 +278,7 @@ using namespace Parma_Polyhedra_Library;
   echo "*** If you have an old version installed, it is best to remove it,"
   echo "*** although you may also be able to get things to work by modifying"
   echo "*** LD_LIBRARY_PATH."
-],
-[
+],[
   echo "*** The test program failed to compile or link. See the file"
   echo "*** config.log for the exact error that occured.  This usually means"
   echo "*** the PPL was incorrectly installed or that someone moved the PPL"

m4/sage_spkg_collect.m4

@@ -200,7 +200,7 @@ for DIR in $SAGE_ROOT/build/pkgs/*; do
                         multiple installation records for $SPKG_NAME:
                         m4_newline($(ls -l "$SAGE_SPKG_INST/$SPKG_NAME"-*))
                         m4_newline([only one should exist, so please delete some or all
-                        of these files and re-run \"$srcdir/configure\"])
+                        of these files and re-run "$srcdir/configure"])
                     ]))
                 ])
                 stampfile=yes

src/VERSION.txt

@@ -1 +1 @@
-9.4.beta6
+9.4.rc1

src/bin/sage-version.sh

@@ -1,5 +1,5 @@
 # Sage version information for shell scripts
 # This file is auto-generated by the sage-update-version script, do not edit!
-SAGE_VERSION='9.4.beta6'
-SAGE_RELEASE_DATE='2021-07-24'
-SAGE_VERSION_BANNER='SageMath version 9.4.beta6, Release Date: 2021-07-24'
+SAGE_VERSION='9.4.rc1'
+SAGE_RELEASE_DATE='2021-08-08'
+SAGE_VERSION_BANNER='SageMath version 9.4.rc1, Release Date: 2021-08-08'