Skip to content

Commit 2cd9c6b

Browse files
author
Release Manager
committed
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):
2 parents 6d196e4 + dbfe9a2 commit 2cd9c6b

25 files changed

+41
-94
lines changed

‎.github/workflows/ci-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
fail-fast: false
110110
max-parallel: 4
111111
matrix:
112-
os: [ macos-11, macos-12, macos-14 ]
112+
os: [ macos-12, macos-13, macos-14 ]
113113
tox_system_factor: [macos-nobootstrap]
114114
tox_packages_factor: [minimal]
115115
xcode_version_factor: [default]

‎.github/workflows/macos.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,19 @@ on:
1919
type: string
2020
# System configuration
2121
osversion_xcodeversion_toxenv_tuples:
22-
# As of 2024-02, "runs-on: macos-latest" is macos-12.
23-
# and "runs-on: macos-14" selects the new M1 runners.
22+
# As of 2024-05, "runs-on: macos-latest" and "runs-on: macos-14" selects the new M1 runners.
2423
# 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
2524
description: 'Stringified JSON object'
2625
default: >-
27-
[["11", "xcode_13.2.1", "homebrew-macos-usrlocal-minimal"],
28-
["12", "", "homebrew-macos-usrlocal-minimal"],
26+
[["12", "", "homebrew-macos-usrlocal-minimal"],
2927
["12", "", "homebrew-macos-usrlocal-standard"],
3028
["12", "", "homebrew-macos-usrlocal-python3_xcode-standard"],
3129
["12", "", "homebrew-macos-usrlocal-maximal"],
3230
["13", "xcode_15.0", "homebrew-macos-usrlocal-standard"],
33-
["14", "", "homebrew-macos-opthomebrew-standard"],
34-
["latest", "", "conda-forge-macos-minimal"],
35-
["latest", "", "conda-forge-macos-standard"],
36-
["14", "", "conda-forge-macos-standard"]]
31+
["latest", "", "homebrew-macos-opthomebrew-standard"],
32+
["13", "", "conda-forge-macos-minimal"],
33+
["13", "", "conda-forge-macos-standard"],
34+
["latest", "", "conda-forge-macos-standard"]]
3735
type: string
3836
extra_sage_packages:
3937
description: 'Extra Sage packages to install as system packages'

‎build/pkgs/brial/spkg-install.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# is installed by the "sage_brial" spkg.
55
#
66
cd src
7+
cp "$SAGE_ROOT"/config/config.* .
78
sdh_configure \
89
--enable-shared --disable-static \
910
--with-boost-unit-test-framework=no

‎build/pkgs/cliquer/spkg-install.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
cd src
22

3+
cp "$SAGE_ROOT"/config/config.* .
34
sdh_configure
45
sdh_make
56
sdh_make_install

‎build/pkgs/gengetopt/spkg-build.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
cd src
2+
cp "$SAGE_ROOT"/config/config.* build-aux/
23
sdh_configure
34

45
# Don't run "make" at the top-level because the documentation build

‎build/pkgs/givaro/spkg-install.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ if [ "$SAGE_FAT_BINARY" = yes ]; then
99
GIVARO_CONFIGURE="--disable-sse --disable-sse2 --disable-sse3 --disable-ssse3 --disable-sse41 --disable-sse42 --disable-fma --disable-fma4 --disable-avx --disable-avx2 $GIVARO_CONFIGURE"
1010
fi
1111

12+
cp "$SAGE_ROOT"/config/config.* build-aux/
1213
sdh_configure $SAGE_CONFIGURE_GMP --enable-shared $GIVARO_CONFIGURE
1314
sdh_make
1415
sdh_make_install

‎build/pkgs/libbraiding/spkg-install.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
cd src
2+
cp "$SAGE_ROOT"/config/config.* build-aux/
23
sdh_configure $LIBBRAIDING_CONFIGURE
34
sdh_make
45
sdh_make_install -j1

‎build/pkgs/libgd/spkg-install.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cd src
22

33
export CFLAGS="-g $CFLAGS"
44

5+
cp "$SAGE_ROOT"/config/config.* config/
56
# We explicitly disable X, fontconfig, and support of various formats/libraries.
67
# We only need png.
78
# see https://github.com/libgd/libgd/blob/master/configure.ac

‎build/pkgs/libhomfly/spkg-install.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
cd src
2+
cp "$SAGE_ROOT"/config/config.* build-aux/
23
sdh_configure $LIBHOMFLY_CONFIGURE
34
sdh_make
45
sdh_make_install -j1

‎build/pkgs/lrcalc/spkg-install.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
cd src
22

3+
cp "$SAGE_ROOT"/config/config.* .
34
sdh_configure
45
sdh_make
56
sdh_make_install

‎build/pkgs/m4ri/checksums.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
tarball=m4ri-VERSION.tar.gz
2-
sha1=7d0d680f1e983c1d5b24e49f25194e2f327690b4
3-
sha256=a2ba0d74ec5129c6fab59cd7d8e7a9f00a69ec63b76672105faef524f9d88556
2+
sha1=7e5eebc83d8eeb44865e26b52667b1acfd08f7b1
3+
sha256=0dfb34aed351882a0f2281535ea6f81c690a5efeb14edab131d9ba0dffe44863
4+
upstream_url=https://bitbucket.org/malb/m4ri/downloads/m4ri-VERSION.tar.gz

‎build/pkgs/m4ri/package-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20200115
1+
20200125

‎build/pkgs/m4ri/patches/mzd_fix.patch

Lines changed: 0 additions & 76 deletions
This file was deleted.

‎build/pkgs/m4ri/spkg-install.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ fi
1717

1818
cd src
1919

20+
cp "$SAGE_ROOT"/config/config.* .
21+
2022
# Configure and build M4RI
2123
sdh_configure --enable-shared --disable-static $ENABLE_DEBUG $DISABLE_SSE2
2224
sdh_make

‎build/pkgs/m4rie/checksums.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
tarball=m4rie-VERSION.tar.gz
2-
sha1=728524509dd30da2dc960814b61d0bae67f83043
3-
sha256=aea462e8c9b4c0303c0a064bd7ead52fe81214e59a7fc694f350161cad4f2c85
2+
sha1=7c956bcecc87ec076dd51f923375136155dfa0fa
3+
sha256=7f3107f7cd10f6c22d9663d9536e1af2f551e10183601852a60d760918caf58d
4+
upstream_url=https://bitbucket.org/malb/m4rie/downloads/m4rie-VERSION.tar.gz

‎build/pkgs/m4rie/package-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20200115
1+
20200125

‎build/pkgs/m4rie/spkg-install.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ export LDFLAGS
2323
# build M4RIE
2424

2525
cd $ROOT_DIR/src/
26+
27+
cp "$SAGE_ROOT"/config/config.* .
28+
2629
sdh_configure --enable-shared --disable-static $ENABLE_DEBUG
2730
sdh_make
2831
sdh_make_install

‎build/pkgs/ntl/spkg-install.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ ntl_configure()
2121

2222
cd "$SRC"
2323

24+
cp "$SAGE_ROOT"/config/config.* src/libtool-origin/
25+
2426
# Run the configure script, setting CC, CXX, CFLAGS etc as needed.
2527
# This ensures that they get written by DoConfig into 'makefile'.
2628
CFLAGS="-O2 -g $CFLAGS"

‎build/pkgs/patch/checksums.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
tarball=patch-VERSION.tar.gz
2-
sha1=04d23f6e48e95efb07d12ccf44d1f35fb210f457
3-
sha256=7436f5a19f93c3ca83153ce9c5cbe4847e97c5d956e57a220121e741f6e7968f
2+
sha1=0ed8f3e49d84964f27e27c712fc8780e291dfa60
3+
sha256=8cf86e00ad3aaa6d26aca30640e86b0e3e1f395ed99f189b06d4c9f74bc58a4e
4+
upstream_url=https://ftp.gnu.org/gnu/patch/patch-VERSION.tar.gz

‎build/pkgs/patch/package-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.5
1+
2.7.6

‎build/pkgs/patch/spkg-install.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ if [ "x$UNAME" = xAIX ] ; then
77
fi
88

99
cd src
10+
cp "$SAGE_ROOT"/config/config.* build-aux/
1011
sdh_configure
1112
sdh_make
1213
sdh_make_install

‎build/pkgs/ppl/spkg-install.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ export CXXFLAGS="$CXXFLAGS -I$SAGE_LOCAL/include"
33

44
cd src
55

6+
cp "$SAGE_ROOT"/config/config.* .
7+
68
# Enable only what's needed for Sage
79
PPL_CONFIGURE="--enable-coefficients=mpz --disable-fpmath $PPL_CONFIGURE"
810

‎build/pkgs/rw/spkg-install.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
cd src
22

3+
cp "$SAGE_ROOT"/config/config.* .
34
sdh_configure --enable-executable=no # no igraph dependency
45
sdh_make
56
sdh_make_install

‎build/pkgs/symmetrica/spkg-install.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ cd src
22

33
export CFLAGS="-O2 -g $CFLAGS -fPIC -DFAST -DALLTRUE"
44

5+
cp "$SAGE_ROOT"/config/config.* build-aux/
56
sdh_configure
67
sdh_make_install

‎build/pkgs/zeromq/spkg-install.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
cd src
22

3+
cp "$SAGE_ROOT"/config/config.* config/
4+
35
# Do not treat warnings as errors, see
46
# https://github.com/zeromq/libzmq/issues/2818
57
sdh_configure --disable-Werror

0 commit comments

Comments
 (0)