Merge branch 'macos-arm64-upgrades' into HEAD

mkoeppe · May 16, 2024 · 817cd87 · 817cd87
2 parents 3e97075 + e79a544
commit 817cd87
Show file tree

Hide file tree

Showing 25 changed files with 44 additions and 97 deletions.
diff --git a/.github/workflows/ci-macos.yml b/.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]

diff --git a/.github/workflows/macos.yml b/.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'

diff --git a/build/pkgs/brial/spkg-install.in b/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

diff --git a/build/pkgs/cliquer/spkg-install.in b/build/pkgs/cliquer/spkg-install.in
@@ -1,5 +1,6 @@
 cd src
 
+cp "$SAGE_ROOT"/config/config.* .
 sdh_configure
 sdh_make
 sdh_make_install
diff --git a/build/pkgs/gengetopt/spkg-build.in b/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

diff --git a/build/pkgs/givaro/spkg-install.in b/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
diff --git a/build/pkgs/libbraiding/spkg-install.in b/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
diff --git a/build/pkgs/libgd/spkg-install.in b/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

diff --git a/build/pkgs/libhomfly/spkg-install.in b/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
diff --git a/build/pkgs/lrcalc/spkg-install.in b/build/pkgs/lrcalc/spkg-install.in
@@ -1,5 +1,6 @@
 cd src
 
+cp "$SAGE_ROOT"/config/config.* .
 sdh_configure
 sdh_make
 sdh_make_install
diff --git a/build/pkgs/m4ri/checksums.ini b/build/pkgs/m4ri/checksums.ini
@@ -1,4 +1,5 @@
 tarball=m4ri-VERSION.tar.gz
-sha1=7d0d680f1e983c1d5b24e49f25194e2f327690b4
-md5=3fb6a27437bf535128d605fe47c8fae8
-cksum=1002661464
+sha1=7e5eebc83d8eeb44865e26b52667b1acfd08f7b1
+md5=5028ac6155f137ebc4443a192a270164
+cksum=3237898741
+upstream_url=https://bitbucket.org/malb/m4ri/downloads/m4ri-VERSION.tar.gz
diff --git a/build/pkgs/m4ri/package-version.txt b/build/pkgs/m4ri/package-version.txt
@@ -1 +1 @@
-20200115
+20200125
diff --git a/build/pkgs/m4ri/patches/mzd_fix.patch b/build/pkgs/m4ri/patches/mzd_fix.patch
diff --git a/build/pkgs/m4ri/spkg-install.in b/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

diff --git a/build/pkgs/m4rie/checksums.ini b/build/pkgs/m4rie/checksums.ini
@@ -1,4 +1,5 @@
 tarball=m4rie-VERSION.tar.gz
-sha1=728524509dd30da2dc960814b61d0bae67f83043
-md5=e7685c63e7bab4c5a0922a161499ba83
-cksum=127676695
+sha1=7c956bcecc87ec076dd51f923375136155dfa0fa
+md5=889d97476fcc11126aecf4eefa2df056
+cksum=4079410075
+upstream_url=https://bitbucket.org/malb/m4rie/downloads/m4rie-VERSION.tar.gz
diff --git a/build/pkgs/m4rie/package-version.txt b/build/pkgs/m4rie/package-version.txt
@@ -1 +1 @@
-20200115
+20200125
diff --git a/build/pkgs/m4rie/spkg-install.in b/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
diff --git a/build/pkgs/ntl/spkg-install.in b/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"

diff --git a/build/pkgs/patch/checksums.ini b/build/pkgs/patch/checksums.ini
@@ -1,4 +1,5 @@
 tarball=patch-VERSION.tar.gz
-sha1=04d23f6e48e95efb07d12ccf44d1f35fb210f457
-md5=ed4d5674ef4543b4eb463db168886dc7
-cksum=2777655587
+sha1=0ed8f3e49d84964f27e27c712fc8780e291dfa60
+md5=4c68cee989d83c87b00a3860bcd05600
+cksum=67284525
+upstream_url=https://ftp.gnu.org/gnu/patch/patch-VERSION.tar.gz
diff --git a/build/pkgs/patch/package-version.txt b/build/pkgs/patch/package-version.txt
@@ -1 +1 @@
-2.7.5
+2.7.6
diff --git a/build/pkgs/patch/spkg-install.in b/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
diff --git a/build/pkgs/ppl/spkg-install.in b/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"
 

diff --git a/build/pkgs/rw/spkg-install.in b/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
diff --git a/build/pkgs/symmetrica/spkg-install.in b/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
diff --git a/build/pkgs/zeromq/spkg-install.in b/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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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"
@@ Expand Down @@