From 0fccaf53b2f7e3748592dfb4aa6f9d7bc3ce0191 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 4 Feb 2024 17:46:35 -0800 Subject: [PATCH 01/13] build/pkgs/patch: Update to 2.7.6, add upstream_url --- build/pkgs/patch/checksums.ini | 7 ++++--- build/pkgs/patch/package-version.txt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/pkgs/patch/checksums.ini b/build/pkgs/patch/checksums.ini index fa51ec84b12..8a978c0fc66 100644 --- 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 index a603bb50a29..49cdd668e1c 100644 --- a/build/pkgs/patch/package-version.txt +++ b/build/pkgs/patch/package-version.txt @@ -1 +1 @@ -2.7.5 +2.7.6 From 1a510b041a6bc0c0e62d17a3dd15130b763b3def Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 4 Feb 2024 17:57:24 -0800 Subject: [PATCH 02/13] build/pkgs/patch: Use updated build-aux scripts --- build/pkgs/patch/spkg-install.in | 1 + 1 file changed, 1 insertion(+) diff --git a/build/pkgs/patch/spkg-install.in b/build/pkgs/patch/spkg-install.in index 57f66569cb0..444505b53bd 100644 --- 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 From 3c1a6765274a3c6db195a93bccd319675cb56e77 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 4 Feb 2024 18:08:19 -0800 Subject: [PATCH 03/13] build/pkgs/m4ri: Update to 20200125 --- build/pkgs/m4ri/checksums.ini | 7 ++++--- build/pkgs/m4ri/package-version.txt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/pkgs/m4ri/checksums.ini b/build/pkgs/m4ri/checksums.ini index f7a8318e9dd..32318af8586 100644 --- 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 index ba948c594d4..d14eb0d9922 100644 --- a/build/pkgs/m4ri/package-version.txt +++ b/build/pkgs/m4ri/package-version.txt @@ -1 +1 @@ -20200115 +20200125 From c9fec180155716242e2513c1e304bc657c18f1a4 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 4 Feb 2024 18:09:29 -0800 Subject: [PATCH 04/13] build/pkgs/m4rie: Update to 20200125 --- build/pkgs/m4rie/checksums.ini | 7 ++++--- build/pkgs/m4rie/package-version.txt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/pkgs/m4rie/checksums.ini b/build/pkgs/m4rie/checksums.ini index 6c4abb19145..8dd506a989a 100644 --- 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 index ba948c594d4..d14eb0d9922 100644 --- a/build/pkgs/m4rie/package-version.txt +++ b/build/pkgs/m4rie/package-version.txt @@ -1 +1 @@ -20200115 +20200125 From 38654896ecbc2d172e9c36652d8747190612037b Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 4 Feb 2024 18:15:57 -0800 Subject: [PATCH 05/13] build/pkgs/{cliquer,gengetopt,givaro,libgd,lrcalc}: Use newer version of build-aux --- build/pkgs/cliquer/spkg-install.in | 1 + build/pkgs/gengetopt/spkg-build.in | 1 + build/pkgs/givaro/spkg-install.in | 1 + build/pkgs/libbraiding/spkg-install.in | 1 + build/pkgs/libgd/spkg-install.in | 1 + build/pkgs/lrcalc/spkg-install.in | 1 + 6 files changed, 6 insertions(+) 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/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 From 332f1f38a13a4c79a82fa076b4e574f1d18fa2f7 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 4 Feb 2024 18:21:39 -0800 Subject: [PATCH 06/13] build/pkgs/m4ri/patches/mzd_fix.patch: Remove, upstreamed --- build/pkgs/m4ri/patches/mzd_fix.patch | 76 --------------------------- 1 file changed, 76 deletions(-) delete mode 100644 build/pkgs/m4ri/patches/mzd_fix.patch 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 Date: Sun, 4 Feb 2024 18:54:19 -0800 Subject: [PATCH 07/13] build/pkgs/{libhomfly,ppl,rw,symmetrica,zeromq}: Use newer version of build-aux --- build/pkgs/libhomfly/spkg-install.in | 1 + build/pkgs/ppl/spkg-install.in | 2 ++ build/pkgs/rw/spkg-install.in | 1 + build/pkgs/symmetrica/spkg-install.in | 1 + build/pkgs/zeromq/spkg-install.in | 2 ++ 5 files changed, 7 insertions(+) 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/ppl/spkg-install.in b/build/pkgs/ppl/spkg-install.in index c986b3a20c6..c872ff1337c 100644 --- 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 index ffd3fe98238..0a55e1e8fa0 100644 --- 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 index 17d240e98e0..4bc551a2588 100644 --- 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 index b94c1d62a09..c2119c50e94 100644 --- 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 From 89a43758c50e4eb16be2290bd55007250ce867fa Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 4 Feb 2024 19:20:40 -0800 Subject: [PATCH 08/13] build/pkgs/{m4ri,m4rie}: Use newer version of build-aux --- build/pkgs/m4ri/spkg-install.in | 2 ++ build/pkgs/m4rie/spkg-install.in | 3 +++ 2 files changed, 5 insertions(+) diff --git a/build/pkgs/m4ri/spkg-install.in b/build/pkgs/m4ri/spkg-install.in index 392265fc116..0f54a7c481b 100644 --- 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/spkg-install.in b/build/pkgs/m4rie/spkg-install.in index 4d242bc52cf..a79056a3f43 100644 --- 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 From 42dd0416572da6755fae4058a1611d295167e466 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 4 Feb 2024 20:00:22 -0800 Subject: [PATCH 09/13] build/pkgs/{ntl,brial}: Use newer version of build-aux --- build/pkgs/brial/spkg-install.in | 1 + build/pkgs/ntl/spkg-install.in | 2 ++ 2 files changed, 3 insertions(+) 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/ntl/spkg-install.in b/build/pkgs/ntl/spkg-install.in index d82ddf370e5..3faa999452c 100644 --- 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" From 74f6a86a01a87a00d5dc76a0706b1abf853ef340 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 7 May 2024 14:07:13 -0700 Subject: [PATCH 10/13] .github/workflows/macos.yml: Update for changed macOS runners --- .github/workflows/macos.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) 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' From e79a5447e2443f571f59fe6fa9bc52513631a08f Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 7 May 2024 14:08:53 -0700 Subject: [PATCH 11/13] .github/workflows/ci-macos.yml (local-macos-nohomebrew): Remove macos-11, add macos-13 --- .github/workflows/ci-macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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] From 1de23bfd76b867a082dc1f06426b63a68e01a11a Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 19 May 2024 11:18:48 -0700 Subject: [PATCH 12/13] sage -package fix-checksum :all: --- build/pkgs/patch/checksums.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/pkgs/patch/checksums.ini b/build/pkgs/patch/checksums.ini index 8a978c0fc66..14944d0ae3d 100644 --- a/build/pkgs/patch/checksums.ini +++ b/build/pkgs/patch/checksums.ini @@ -1,5 +1,4 @@ tarball=patch-VERSION.tar.gz sha1=0ed8f3e49d84964f27e27c712fc8780e291dfa60 -md5=4c68cee989d83c87b00a3860bcd05600 -cksum=67284525 +sha256=8cf86e00ad3aaa6d26aca30640e86b0e3e1f395ed99f189b06d4c9f74bc58a4e upstream_url=https://ftp.gnu.org/gnu/patch/patch-VERSION.tar.gz From dbfe9a27acbab51f8a08562f0edc17b3d8c97a69 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 23 May 2024 14:51:07 -0700 Subject: [PATCH 13/13] build/pkgs/{m4ri,m4rie}/checksums.ini: Add sha256 --- build/pkgs/m4ri/checksums.ini | 3 +-- build/pkgs/m4rie/checksums.ini | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build/pkgs/m4ri/checksums.ini b/build/pkgs/m4ri/checksums.ini index 32318af8586..c57e9da969c 100644 --- a/build/pkgs/m4ri/checksums.ini +++ b/build/pkgs/m4ri/checksums.ini @@ -1,5 +1,4 @@ tarball=m4ri-VERSION.tar.gz sha1=7e5eebc83d8eeb44865e26b52667b1acfd08f7b1 -md5=5028ac6155f137ebc4443a192a270164 -cksum=3237898741 +sha256=0dfb34aed351882a0f2281535ea6f81c690a5efeb14edab131d9ba0dffe44863 upstream_url=https://bitbucket.org/malb/m4ri/downloads/m4ri-VERSION.tar.gz diff --git a/build/pkgs/m4rie/checksums.ini b/build/pkgs/m4rie/checksums.ini index 8dd506a989a..a83c9a9b35f 100644 --- a/build/pkgs/m4rie/checksums.ini +++ b/build/pkgs/m4rie/checksums.ini @@ -1,5 +1,4 @@ tarball=m4rie-VERSION.tar.gz sha1=7c956bcecc87ec076dd51f923375136155dfa0fa -md5=889d97476fcc11126aecf4eefa2df056 -cksum=4079410075 +sha256=7f3107f7cd10f6c22d9663d9536e1af2f551e10183601852a60d760918caf58d upstream_url=https://bitbucket.org/malb/m4rie/downloads/m4rie-VERSION.tar.gz