Skip to content

Commit 3583d3c

Browse files
authored
Merge pull request #108 from infosiftr/eol-11
Remove EOL 11
2 parents f2681d9 + b5055bc commit 3583d3c

File tree

7 files changed

+16
-190
lines changed

7 files changed

+16
-190
lines changed

11/Dockerfile

Lines changed: 0 additions & 158 deletions
This file was deleted.

12/Dockerfile

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

13/Dockerfile

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

14/Dockerfile

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile.template

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,22 +97,18 @@ RUN set -ex; \
9797
extraConfigureArgs=''; \
9898
dpkgArch="$(dpkg --print-architecture)"; \
9999
case "$dpkgArch" in \
100-
# with-arch: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-11-debian/debian/rules2#L462-502
101-
# with-float: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-11-debian/debian/rules.defs#L502-512
102-
# with-mode: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-11-debian/debian/rules.defs#L480
100+
# with-arch: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-13-debian/debian/rules2#L533-573
101+
# with-float: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-13-debian/debian/rules2#L521-523
102+
# with-mode: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-13-debian/debian/rules2#L571
103103
armel) \
104104
extraConfigureArgs="$extraConfigureArgs --with-arch=armv5te --with-float=soft" \
105105
;; \
106106
armhf) \
107-
{{ if env.version | tonumber >= 11 then ( -}}
108107
# https://bugs.launchpad.net/ubuntu/+source/gcc-defaults/+bug/1939379/comments/2
109108
extraConfigureArgs="$extraConfigureArgs --with-arch=armv7-a+fp --with-float=hard --with-mode=thumb" \
110-
{{ ) else ( -}}
111-
extraConfigureArgs="$extraConfigureArgs --with-arch=armv7-a --with-float=hard --with-fpu=vfpv3-d16 --with-mode=thumb" \
112-
{{ ) end -}}
113109
;; \
114110
\
115-
# with-arch-32: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-11-debian/debian/rules2#L598
111+
# with-arch-32: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-13-debian/debian/rules2#L670
116112
i386) \
117113
extraConfigureArgs="$extraConfigureArgs --with-arch-32=i686"; \
118114
;; \

versions.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
{
2-
"11": {
3-
"compression": "xz",
4-
"debian": {
5-
"version": "bullseye"
6-
},
7-
"eol": "2026-01-19",
8-
"lastModified": "2024-07-19",
9-
"version": "11.5.0"
10-
},
112
"12": {
123
"compression": "xz",
134
"debian": {

versions.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ set -Eeuo pipefail
88

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

1613
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

0 commit comments

Comments
 (0)