Skip to content

Commit

Permalink
sagemathgh-37537: build/pkgs/{gcc,gfortran}/spkg-configure.m4: Allow …
Browse files Browse the repository at this point in the history
…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):
  • Loading branch information
Release Manager committed May 8, 2024
2 parents 1d26ae4 + d17b927 commit 906d7b9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions build/pkgs/gcc/spkg-configure.m4
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ SAGE_SPKG_CONFIGURE_BASE([gcc], [
# Install our own GCC if the system-provided one is older than gcc 8.4
SAGE_SHOULD_INSTALL_GCC([you have $CXX version $GXX_VERSION, which is quite old])
],
[1[[4-9]].*], [
# Install our own GCC if the system-provided one is newer than 13.x.
[1[[5-9]].*], [
# Install our own GCC if the system-provided one is newer than 14.x.
# See https://github.com/sagemath/sage/issues/29456
SAGE_SHOULD_INSTALL_GCC([$CXX is g++ version $GXX_VERSION, which is too recent for this version of Sage])
])
Expand Down
4 changes: 2 additions & 2 deletions build/pkgs/gfortran/spkg-configure.m4
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ SAGE_SPKG_CONFIGURE([gfortran], [
# Install our own gfortran if the system-provided one is older than gcc-4.8.
SAGE_SHOULD_INSTALL_GFORTRAN([$FC is version $GFORTRAN_VERSION, which is quite old])
],
[1[[4-9]].*], [
# Install our own gfortran if the system-provided one is newer than 13.x.
[1[[5-9]].*], [
# Install our own gfortran if the system-provided one is newer than 14.x.
# See https://github.com/sagemath/sage/issues/29456, https://github.com/sagemath/sage/issues/31838
SAGE_MUST_INSTALL_GFORTRAN([$FC is version $GFORTRAN_VERSION, which is too recent for this version of Sage])
])
Expand Down

0 comments on commit 906d7b9

Please sign in to comment.