Skip to content

Commit 072570a

Browse files
author
Release Manager
committed
sagemathgh-35810: Drop support for GCC < 8.4, drop testing of `debian-buster` and `fedora-29` <!-- Please provide a concise, informative and self-explanatory title. --> <!-- Don't put issue numbers in the title. Put it in the Description below. --> <!-- For example, instead of "Fixes sagemath#12345", use "Add a new method to multiply two integers" --> ### 📚 Description <!-- Describe your changes here in detail. --> <!-- Why is this change required? What problem does it solve? --> Prerequisite of: - sagemath#34816 - sagemath#35703 - sagemath#35801 See also: - sagemath#32074 Instead of fully dropping `debian-buster` (LTS until 2024-06) in the CI, we replace it by `debian-buster-gcc_spkg` to verify that users on this platform have the recourse of installing a newer GCC. We also remove `linuxmint-19.3-gcc_8-python3.8` and change `fedora-30-python3.8` to `fedora-30` (which builds python from spkg), to prevent a merge conflict with sagemath#35404 We also add `debian-trixie` (= current testing). <!-- If this PR resolves an open issue, please link to it here. For example "Fixes sagemath#12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. It should be `[x]` not `[x ]`. --> - [x] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [x] 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 - sagemath#12345: short description why this is a dependency - sagemath#34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: sagemath#35810 Reported by: Matthias Köppe Reviewer(s): Dima Pasechnik
2 parents afe8854 + 8436612 commit 072570a

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

.github/workflows/docker.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ on:
2323
"ubuntu-kinetic",
2424
"ubuntu-lunar",
2525
"ubuntu-mantic",
26-
"debian-buster",
26+
"debian-buster-gcc_spkg",
2727
"debian-bullseye",
2828
"debian-bookworm",
29+
"debian-trixie",
2930
"debian-sid",
3031
"linuxmint-20.1",
3132
"linuxmint-20.2",
@@ -57,7 +58,6 @@ on:
5758
"opensuse-tumbleweed-python3.10",
5859
"conda-forge",
5960
"ubuntu-bionic-gcc_8-i386",
60-
"debian-buster-i386",
6161
"debian-bullseye-i386",
6262
]
6363
tox_packages_factors:

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ in the Installation Guide.
189189

190190
3. [Linux, WSL] Install the required minimal build prerequisites.
191191

192-
- Compilers: `gcc`, `gfortran`, `g++` (GCC 8.x to 12.x and recent
193-
versions of Clang (LLVM) are supported).
192+
- Compilers: `gcc`, `gfortran`, `g++` (GCC versions from 8.4.0 to 13.x
193+
and recent versions of Clang (LLVM) are supported).
194194
See [build/pkgs/gcc/SPKG.rst](build/pkgs/gcc/SPKG.rst) and
195195
[build/pkgs/gfortran/SPKG.rst](build/pkgs/gfortran/SPKG.rst)
196196
for a discussion of suitable compilers.

build/pkgs/gcc/SPKG.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Description
66

77
This package represents the required C and C++ compilers.
88

9-
- GCC (GNU Compiler Collection) versions 8.x to 12.x are supported.
9+
- GCC (GNU Compiler Collection) versions 8.x (>= 8.4.0) to 13.x are supported.
1010

1111
- Clang (LLVM) is also supported.
1212

@@ -25,7 +25,7 @@ need to run::
2525
Vendor and versions of the C and C++ compilers should match.
2626

2727
Users of older Linux distributions (in particular, ``ubuntu-xenial``
28-
or older, ``debian-stretch`` or older, ``linuxmint-18`` or older)
28+
or older, ``debian-buster`` or older, ``linuxmint-18`` or older)
2929
should upgrade their systems before attempting to install Sage from
3030
source. Users of ``ubuntu-bionic``, ``linuxmint-19.x``, and
3131
``opensuse-15.x`` can install a versioned ``gcc`` system package

build/pkgs/gcc/spkg-configure.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ SAGE_SPKG_CONFIGURE_BASE([gcc], [
161161
# Add the .0 because Debian/Ubuntu gives version numbers like
162162
# 4.6 instead of 4.6.4 (Trac #18885)
163163
AS_CASE(["$GXX_VERSION.0"],
164-
[[[0-7]].*], [
165-
# Install our own GCC if the system-provided one is older than gcc 8
164+
[[[0-7]].*|8.[[0-3]].*], [
165+
# 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
],
168168
[1[[4-9]].*], [

tox.ini

+1
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ setenv =
238238
debian-bullseye: BASE_TAG=bullseye
239239
debian-bullseye: IGNORE_MISSING_SYSTEM_PACKAGES=yes
240240
debian-bookworm: BASE_TAG=bookworm
241+
debian-trixie: BASE_TAG=trixie
241242
debian-sid: BASE_TAG=sid
242243
#
243244
# https://hub.docker.com/u/linuxmintd

0 commit comments

Comments
 (0)