Skip to content

Commit

Permalink
Downgrade gcc 11 back to bullseye
Browse files Browse the repository at this point in the history
  • Loading branch information
yosifkit committed Jun 21, 2023
1 parent 4c74f6f commit e7e43ba
Show file tree
Hide file tree
Showing 8 changed files with 59 additions and 15 deletions.
10 changes: 8 additions & 2 deletions 10/Dockerfile

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

12 changes: 9 additions & 3 deletions 11/Dockerfile

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

10 changes: 8 additions & 2 deletions 12/Dockerfile

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

10 changes: 8 additions & 2 deletions 13/Dockerfile

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

10 changes: 8 additions & 2 deletions 9/Dockerfile

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

10 changes: 8 additions & 2 deletions Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,14 @@ RUN set -ex; \
# this filename needs to sort higher than all the architecture filenames ("aarch64-...", "armeabi...", etc)
{ echo '/usr/local/lib64'; echo '/usr/local/lib'; } > /etc/ld.so.conf.d/000-local-lib.conf; \
ldconfig -v; \
# smoke test to make sure the libs from /usr/local don't break Debian
apt-get --version
# the libc created by gcc might be too old for a newer Debian
# check that the Debian libstdc++ doesn't have newer requirements than the gcc one
bash -Eeuo pipefail -xc ' \
deb="$(strings /usr/lib/*/libstdc++.so* | grep "^GLIBC" | sort -u)"; \
gcc="$(strings /usr/local/lib*/libstdc++.so | grep "^GLIBC" | sort -u)"; \
diff="$(comm -23 <(cat <<<"$deb") <(cat <<<"$gcc"))"; \
test -z "$diff"; \
'

# ensure that alternatives are pointing to the new compiler and that old one is no longer used
RUN set -ex; \
Expand Down
2 changes: 1 addition & 1 deletion versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"11": {
"compression": "xz",
"debian": {
"version": "bookworm"
"version": "bullseye"
},
"eol": "2024-11-29",
"lastModified": "2023-05-29",
Expand Down
10 changes: 9 additions & 1 deletion versions.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
#!/bin/bash
set -Eeuo pipefail

# the libc created by gcc might be too old for a newer Debian:
# https://packages.debian.org/stable/gcc
# bookworm: 12.2
# bullseye: 10.2
# buster: 8.3

# defaultDebianSuite gets auto-declared below
declare -A debianSuites=(
# the libc created by gcc is too old for a newer Debian
# $ convert
# convert: /usr/local/lib64/libstdc++.so.6: version `GLIBCXX_3.4.30' not found
[11]='bullseye'
# $ apt --version
# apt: /usr/local/lib64/libstdc++.so.6: version `GLIBCXX_3.4.29' not found
[10]='bullseye'
Expand Down

0 comments on commit e7e43ba

Please sign in to comment.