Skip to content

Remove EOL 11 #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tianon merged 1 commit into from
Jul 22, 2024
Merged

Remove EOL 11 #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 0 additions & 158 deletions 11/Dockerfile
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions 12/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions 13/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions 14/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 4 additions & 8 deletions Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,22 +97,18 @@ RUN set -ex; \
extraConfigureArgs=''; \
dpkgArch="$(dpkg --print-architecture)"; \
case "$dpkgArch" in \
# with-arch: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-11-debian/debian/rules2#L462-502
# with-float: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-11-debian/debian/rules.defs#L502-512
# with-mode: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-11-debian/debian/rules.defs#L480
Copy link
Member

@LaurentGoderre LaurentGoderre Jul 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not familiar with what this does?

Copy link
Member Author

@yosifkit yosifkit Jul 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just updating the links to Debian's packaging of how they build gcc so that we know where we got these flags from.

# with-arch: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-13-debian/debian/rules2#L533-573
# with-float: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-13-debian/debian/rules2#L521-523
# with-mode: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-13-debian/debian/rules2#L571
armel) \
extraConfigureArgs="$extraConfigureArgs --with-arch=armv5te --with-float=soft" \
;; \
armhf) \
{{ if env.version | tonumber >= 11 then ( -}}
# https://bugs.launchpad.net/ubuntu/+source/gcc-defaults/+bug/1939379/comments/2
extraConfigureArgs="$extraConfigureArgs --with-arch=armv7-a+fp --with-float=hard --with-mode=thumb" \
{{ ) else ( -}}
extraConfigureArgs="$extraConfigureArgs --with-arch=armv7-a --with-float=hard --with-fpu=vfpv3-d16 --with-mode=thumb" \
{{ ) end -}}
;; \
\
# with-arch-32: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-11-debian/debian/rules2#L598
# with-arch-32: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-13-debian/debian/rules2#L670
i386) \
extraConfigureArgs="$extraConfigureArgs --with-arch-32=i686"; \
;; \
Expand Down
9 changes: 0 additions & 9 deletions versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
{
"11": {
"compression": "xz",
"debian": {
"version": "bullseye"
},
"eol": "2026-01-19",
"lastModified": "2024-07-19",
"version": "11.5.0"
},
"12": {
"compression": "xz",
"debian": {
Expand Down
3 changes: 0 additions & 3 deletions versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ set -Eeuo pipefail

# defaultDebianSuite gets auto-declared below
declare -A debianSuites=(
# $ convert
# convert: /usr/local/lib64/libstdc++.so.6: version `GLIBCXX_3.4.30' not found
[11]='bullseye'
)

cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
Expand Down