sagemathgh-37919: Upgrades and configure fixes for macOS arm64

    
<!-- ^ Please provide a concise and informative title. -->
<!-- ^ Don't put issue numbers in the title, do this in the PR
description below. -->
<!-- ^ For example, instead of "Fixes sagemath#12345" use "Introduce new method
to calculate 1 + 2". -->
<!-- v Describe your changes below in detail. -->
<!-- v Why is this change required? What problem does it solve? -->
<!-- v If this PR resolves an open issue, please link to it here. For
example, "Fixes sagemath#12345". -->

Also
- update for updated GitHub macOS runner labels

### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. -->

- [x] The title is concise and informative.
- [ ] The description explains in detail what this PR is about.
- [ ] I have linked a relevant issue or discussion.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation and checked the documentation
preview.

### ⌛ Dependencies

<!-- List all open PRs that this PR logically depends on. For example,
-->
<!-- - sagemath#12345: short description why this is a dependency -->
<!-- - sagemath#34567: ... -->

- Depends on sagemath#37726 (merged here to resolve merge conflict)
    
URL: sagemath#37919
Reported by: Matthias Köppe
Reviewer(s):

.github/workflows/ci-macos.yml

@@ -109,7 +109,7 @@ jobs:
       fail-fast: false
       max-parallel: 4
       matrix:
-        os: [ macos-11, macos-12, macos-14 ]
+        os: [ macos-12, macos-13, macos-14 ]
         tox_system_factor: [macos-nobootstrap]
         tox_packages_factor: [minimal]
         xcode_version_factor: [default]

.github/workflows/macos.yml

@@ -19,21 +19,19 @@ on:
         type: string
       # System configuration
       osversion_xcodeversion_toxenv_tuples:
-        # As of 2024-02, "runs-on: macos-latest" is macos-12.
-        # and "runs-on: macos-14" selects the new M1 runners.
+        # As of 2024-05, "runs-on: macos-latest" and "runs-on: macos-14" selects the new M1 runners.
         # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
         description: 'Stringified JSON object'
         default: >-
-          [["11",     "xcode_13.2.1", "homebrew-macos-usrlocal-minimal"],
-           ["12",     "",             "homebrew-macos-usrlocal-minimal"],
+          [["12",     "",             "homebrew-macos-usrlocal-minimal"],
            ["12",     "",             "homebrew-macos-usrlocal-standard"],
            ["12",     "",             "homebrew-macos-usrlocal-python3_xcode-standard"],
            ["12",     "",             "homebrew-macos-usrlocal-maximal"],
            ["13",     "xcode_15.0",   "homebrew-macos-usrlocal-standard"],
-           ["14",     "",             "homebrew-macos-opthomebrew-standard"],
-           ["latest", "",             "conda-forge-macos-minimal"],
-           ["latest", "",             "conda-forge-macos-standard"],
-           ["14",     "",             "conda-forge-macos-standard"]]
+           ["latest", "",             "homebrew-macos-opthomebrew-standard"],
+           ["13",     "",             "conda-forge-macos-minimal"],
+           ["13",     "",             "conda-forge-macos-standard"],
+           ["latest", "",             "conda-forge-macos-standard"]]
         type: string
       extra_sage_packages:
         description: 'Extra Sage packages to install as system packages'

build/pkgs/brial/spkg-install.in

@@ -4,6 +4,7 @@
 # is installed by the "sage_brial" spkg.
 #
 cd src
+cp "$SAGE_ROOT"/config/config.* .
 sdh_configure \
     --enable-shared --disable-static \
     --with-boost-unit-test-framework=no

build/pkgs/cliquer/spkg-install.in

@@ -1,5 +1,6 @@
 cd src
 
+cp "$SAGE_ROOT"/config/config.* .
 sdh_configure
 sdh_make
 sdh_make_install

build/pkgs/gengetopt/spkg-build.in

@@ -1,4 +1,5 @@
 cd src
+cp "$SAGE_ROOT"/config/config.* build-aux/
 sdh_configure
 
 # Don't run "make" at the top-level because the documentation build

build/pkgs/givaro/spkg-install.in

@@ -9,6 +9,7 @@ if [ "$SAGE_FAT_BINARY" = yes ]; then
     GIVARO_CONFIGURE="--disable-sse --disable-sse2 --disable-sse3 --disable-ssse3 --disable-sse41 --disable-sse42 --disable-fma --disable-fma4 --disable-avx --disable-avx2  $GIVARO_CONFIGURE"
 fi
 
+cp "$SAGE_ROOT"/config/config.* build-aux/
 sdh_configure $SAGE_CONFIGURE_GMP --enable-shared $GIVARO_CONFIGURE
 sdh_make
 sdh_make_install

build/pkgs/libbraiding/spkg-install.in

@@ -1,4 +1,5 @@
 cd src
+cp "$SAGE_ROOT"/config/config.* build-aux/
 sdh_configure $LIBBRAIDING_CONFIGURE
 sdh_make
 sdh_make_install -j1

build/pkgs/libgd/spkg-install.in

@@ -2,6 +2,7 @@ cd src
 
 export CFLAGS="-g $CFLAGS"
 
+cp "$SAGE_ROOT"/config/config.* config/
 # We explicitly disable X, fontconfig, and support of various formats/libraries.
 # We only need png.
 # see https://github.com/libgd/libgd/blob/master/configure.ac

build/pkgs/libhomfly/spkg-install.in

@@ -1,4 +1,5 @@
 cd src
+cp "$SAGE_ROOT"/config/config.* build-aux/
 sdh_configure $LIBHOMFLY_CONFIGURE
 sdh_make
 sdh_make_install -j1

build/pkgs/lrcalc/spkg-install.in

@@ -1,5 +1,6 @@
 cd src
 
+cp "$SAGE_ROOT"/config/config.* .
 sdh_configure
 sdh_make
 sdh_make_install

build/pkgs/m4ri/checksums.ini

@@ -1,3 +1,4 @@
 tarball=m4ri-VERSION.tar.gz
-sha1=7d0d680f1e983c1d5b24e49f25194e2f327690b4
-sha256=a2ba0d74ec5129c6fab59cd7d8e7a9f00a69ec63b76672105faef524f9d88556
+sha1=7e5eebc83d8eeb44865e26b52667b1acfd08f7b1
+sha256=0dfb34aed351882a0f2281535ea6f81c690a5efeb14edab131d9ba0dffe44863
+upstream_url=https://bitbucket.org/malb/m4ri/downloads/m4ri-VERSION.tar.gz

build/pkgs/m4ri/package-version.txt

@@ -1 +1 @@
-20200115
+20200125

build/pkgs/m4ri/spkg-install.in

@@ -17,6 +17,8 @@ fi
 
 cd src
 
+cp "$SAGE_ROOT"/config/config.* .
+
 # Configure and build M4RI
 sdh_configure --enable-shared --disable-static $ENABLE_DEBUG $DISABLE_SSE2
 sdh_make

build/pkgs/m4rie/checksums.ini

@@ -1,3 +1,4 @@
 tarball=m4rie-VERSION.tar.gz
-sha1=728524509dd30da2dc960814b61d0bae67f83043
-sha256=aea462e8c9b4c0303c0a064bd7ead52fe81214e59a7fc694f350161cad4f2c85
+sha1=7c956bcecc87ec076dd51f923375136155dfa0fa
+sha256=7f3107f7cd10f6c22d9663d9536e1af2f551e10183601852a60d760918caf58d
+upstream_url=https://bitbucket.org/malb/m4rie/downloads/m4rie-VERSION.tar.gz

build/pkgs/m4rie/package-version.txt

@@ -1 +1 @@
-20200115
+20200125

build/pkgs/m4rie/spkg-install.in

@@ -23,6 +23,9 @@ export LDFLAGS
 # build M4RIE
 
 cd $ROOT_DIR/src/
+
+cp "$SAGE_ROOT"/config/config.* .
+
 sdh_configure --enable-shared --disable-static $ENABLE_DEBUG
 sdh_make
 sdh_make_install

build/pkgs/ntl/spkg-install.in

@@ -21,6 +21,8 @@ ntl_configure()
 
     cd "$SRC"
 
+    cp "$SAGE_ROOT"/config/config.* src/libtool-origin/
+
     # Run the configure script, setting CC, CXX, CFLAGS etc as needed.
     # This ensures that they get written by DoConfig into 'makefile'.
     CFLAGS="-O2 -g $CFLAGS"

build/pkgs/patch/checksums.ini

@@ -1,3 +1,4 @@
 tarball=patch-VERSION.tar.gz
-sha1=04d23f6e48e95efb07d12ccf44d1f35fb210f457
-sha256=7436f5a19f93c3ca83153ce9c5cbe4847e97c5d956e57a220121e741f6e7968f
+sha1=0ed8f3e49d84964f27e27c712fc8780e291dfa60
+sha256=8cf86e00ad3aaa6d26aca30640e86b0e3e1f395ed99f189b06d4c9f74bc58a4e
+upstream_url=https://ftp.gnu.org/gnu/patch/patch-VERSION.tar.gz

build/pkgs/patch/package-version.txt

@@ -1 +1 @@
-2.7.5
+2.7.6

build/pkgs/patch/spkg-install.in

@@ -7,6 +7,7 @@ if [ "x$UNAME" = xAIX ] ; then
 fi
 
 cd src
+cp "$SAGE_ROOT"/config/config.* build-aux/
 sdh_configure
 sdh_make
 sdh_make_install

build/pkgs/ppl/spkg-install.in

@@ -3,6 +3,8 @@ export CXXFLAGS="$CXXFLAGS -I$SAGE_LOCAL/include"
 
 cd src
 
+cp "$SAGE_ROOT"/config/config.* .
+
 # Enable only what's needed for Sage
 PPL_CONFIGURE="--enable-coefficients=mpz --disable-fpmath $PPL_CONFIGURE"
 

build/pkgs/rw/spkg-install.in

@@ -1,5 +1,6 @@
 cd src
 
+cp "$SAGE_ROOT"/config/config.* .
 sdh_configure --enable-executable=no  # no igraph dependency
 sdh_make
 sdh_make_install

build/pkgs/symmetrica/spkg-install.in

@@ -2,5 +2,6 @@ cd src
 
 export CFLAGS="-O2 -g $CFLAGS -fPIC -DFAST -DALLTRUE"
 
+cp "$SAGE_ROOT"/config/config.* build-aux/
 sdh_configure
 sdh_make_install

build/pkgs/zeromq/spkg-install.in

@@ -1,5 +1,7 @@
 cd src
 
+cp "$SAGE_ROOT"/config/config.* config/
+
 # Do not treat warnings as errors, see
 # https://github.com/zeromq/libzmq/issues/2818
 sdh_configure --disable-Werror