diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index d1a5d62f425..2f3a9cf6e4e 100644 --- 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 index ccba31a3dcc..3d0732bcb7e 100644 --- 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 index e048eda6bdc..e0483b1448f 100644 --- 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 index a863950189e..1f79dea79c8 100644 --- 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 index 08e39b1143b..79cfbfd8c70 100644 --- 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 index a47034497b0..ec05be95f16 100644 --- 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 index 7bd121f376d..98bc539ddac 100644 --- 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 index e314d99d2ab..64af214d76f 100644 --- 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 index e32cc2e15cf..c7440f4b44b 100644 --- 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 index a863950189e..1f79dea79c8 100644 --- 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 index 0deac09bc50..c57e9da969c 100644 --- a/build/pkgs/m4ri/checksums.ini +++ b/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 diff --git a/build/pkgs/m4ri/package-version.txt b/build/pkgs/m4ri/package-version.txt index ba948c594d4..d14eb0d9922 100644 --- 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 deleted file mode 100644 index c24cd1e6bf6..00000000000 --- a/build/pkgs/m4ri/patches/mzd_fix.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/m4ri/mzd.c b/m4ri/mzd.c -index 861905c..922dc3c 100644 ---- a/m4ri/mzd.c -+++ b/m4ri/mzd.c -@@ -1894,7 +1894,7 @@ mzd_t *mzd_submatrix(mzd_t *S, mzd_t const *M, rci_t const startrow, rci_t const - } else { - wi_t j; - for(rci_t i=0; irows[i][j/m4ri_radix] = mzd_read_bits(M, startrow+i, startcol+j, m4ri_radix); - S->rows[i][j/m4ri_radix] &= ~S->high_bitmask; - S->rows[i][j/m4ri_radix] |= mzd_read_bits(M, startrow+i, startcol+j, ncols - j) & S->high_bitmask; -diff --git a/tests/test_misc.c b/tests/test_misc.c -index a9a9547..b1a2e32 100644 ---- a/tests/test_misc.c -+++ b/tests/test_misc.c -@@ -76,6 +76,31 @@ int test_png(rci_t m, rci_t n) { - return ret; - } - -+int test_submatrix(const rci_t m, const rci_t n, const rci_t lowr, const rci_t lowc, const rci_t highr, const rci_t highc) { -+ printf("submatrix: m: %4d, n: %4d, (%4d, %4d, %4d, %4d)", m, n, lowr, lowc, highr, highc); -+ assert(highr-lowr > 0); -+ assert(highc-lowc > 0); -+ mzd_t *M = mzd_init(m, n); -+ mzd_randomize(M); -+ mzd_t *S = mzd_init(highr-lowr, highc-lowc); -+ mzd_submatrix(S, M, lowr, lowc, highr, highc); -+ int ret = 0; -+ for(rci_t i=0; i