Skip to content

Commit

Permalink
Trac #33816: Update gcc/gfortran to 12.x + Apple Silicon support, upd…
Browse files Browse the repository at this point in the history
…ate openblas to 0.3.21, gsl to 2.7.1

We would use 12.2.0 plus the feature patch for Apple Silicon support
that the homebrew folks use:
https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/gcc.rb#L12

URL: https://trac.sagemath.org/33816
Reported by: mkoeppe
Ticket author(s): Matthias Koeppe
Reviewer(s): John Palmieri
  • Loading branch information
Release Manager committed Oct 16, 2022
2 parents 73dce53 + e89ba55 commit 25d8bdc
Show file tree
Hide file tree
Showing 13 changed files with 14,283 additions and 51 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
targets: build doc-html
targets_optional: ptest
tox_packages_factors: >-
["minimal]
["minimal"]
docker_push_repository: ghcr.io/${{ github.repository }}/

maximal-pre:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ on:
"opensuse-15.4-gcc_11-python3.10",
"opensuse-tumbleweed-python3.10",
"conda-forge",
"ubuntu-bionic-i386",
"manylinux-2_24-i686",
"ubuntu-bionic-gcc_8-i386",
"debian-buster-i386",
]
tox_packages_factors:
Expand Down
2 changes: 2 additions & 0 deletions build/pkgs/gcc/build-gcc
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@ fi
if [ -n "$AS" -a "$AS" != "as" ]; then
CONFIGURE_AS="--with-as=$AS"
fi
unset AS
if [ -n "$LD" -a "$LD" != "ld" ]; then
CONFIGURE_LD="--with-ld=$LD"
fi
unset LD

# Use SAGE_CXX_WITHOUT_STD instead of CXX.
# This fixes #29162 (gfortran 9.2.0 compile error on debian-jessie with gcc 4.9.2)
Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/gcc/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=gcc-VERSION.tar.xz
sha1=cf86a48278f9a6f4b03d4390550577b20353b4e9
md5=4ee3e8c4c99e7b3444eb79f00f5f7a7e
cksum=215110545
sha1=5dce6dc0091b8049b530d1587513a07201691760
md5=73bafd0af874439dcdb9fc063b6fb069
cksum=2807184004
upstream_url=https://mirrors.kernel.org/gnu/gcc/gcc-VERSION/gcc-VERSION.tar.xz
2 changes: 1 addition & 1 deletion build/pkgs/gcc/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
11.3.0
12.2.0
Loading

0 comments on commit 25d8bdc

Please sign in to comment.