Skip to content

Commit 6b94907

Browse files
author
Release Manager
committed
sagemathgh-37537: build/pkgs/{gcc,gfortran}/spkg-configure.m4: Allow 14.x <!-- ^ 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". --> Fedora 40 already ships GCC 14 Fixes sagemath#37698 ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [ ] 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 accordingly. ### ⌛ 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#37646 URL: sagemath#37537 Reported by: Matthias Köppe Reviewer(s):
2 parents bbca185 + d17b927 commit 6b94907

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build/pkgs/gcc/spkg-configure.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ SAGE_SPKG_CONFIGURE_BASE([gcc], [
165165
# Install our own GCC if the system-provided one is older than gcc 8.4
166166
SAGE_SHOULD_INSTALL_GCC([you have $CXX version $GXX_VERSION, which is quite old])
167167
],
168-
[1[[4-9]].*], [
169-
# Install our own GCC if the system-provided one is newer than 13.x.
168+
[1[[5-9]].*], [
169+
# Install our own GCC if the system-provided one is newer than 14.x.
170170
# See https://github.com/sagemath/sage/issues/29456
171171
SAGE_SHOULD_INSTALL_GCC([$CXX is g++ version $GXX_VERSION, which is too recent for this version of Sage])
172172
])

build/pkgs/gfortran/spkg-configure.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ SAGE_SPKG_CONFIGURE([gfortran], [
8686
# Install our own gfortran if the system-provided one is older than gcc-4.8.
8787
SAGE_SHOULD_INSTALL_GFORTRAN([$FC is version $GFORTRAN_VERSION, which is quite old])
8888
],
89-
[1[[4-9]].*], [
90-
# Install our own gfortran if the system-provided one is newer than 13.x.
89+
[1[[5-9]].*], [
90+
# Install our own gfortran if the system-provided one is newer than 14.x.
9191
# See https://github.com/sagemath/sage/issues/29456, https://github.com/sagemath/sage/issues/31838
9292
SAGE_MUST_INSTALL_GFORTRAN([$FC is version $GFORTRAN_VERSION, which is too recent for this version of Sage])
9393
])

0 commit comments

Comments
 (0)