Skip to content
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.

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

Update gcc #14896

Merged
merged 1 commit into from
Jun 24, 2023
Merged

Update gcc #14896

merged 1 commit into from
Jun 24, 2023

Conversation

tianon
Copy link
Member

@tianon tianon commented Jun 20, 2023

Changes:

@github-actions

This comment has been minimized.

@yosifkit

This comment was marked as outdated.

Changes:

- docker-library/gcc@5986ef2: Merge pull request docker-library/gcc#97 from infosiftr/more-bullseye
- docker-library/gcc@e7e43ba: Downgrade gcc 11 back to bullseye
- docker-library/gcc@4c74f6f: Unnecessary use of double quotes
- docker-library/gcc@de7f7f3: Merge pull request docker-library/gcc#94 from infosiftr/bullseye
- docker-library/gcc@36ad58f: Downgrade 9 and 10 to bullseye
- docker-library/gcc@9da3c87: Drop bookworm special case
@github-actions
Copy link

Diff for 158d311:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 03924a2..b980c76 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,27 +1,27 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/gcc.git
 
-Tags: 9.5.0, 9.5, 9, 9.5.0-bookworm, 9.5-bookworm, 9-bookworm
+Tags: 9.5.0, 9.5, 9, 9.5.0-bullseye, 9.5-bullseye, 9-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 0d98f7923b5ed7f5baec2506413c99e920cf6661
+GitCommit: e7e43ba8177ce15f473d9a799c9e69735e4dbab4
 Directory: 9
 
-Tags: 10.4.0, 10.4, 10, 10.4.0-bookworm, 10.4-bookworm, 10-bookworm
+Tags: 10.4.0, 10.4, 10, 10.4.0-bullseye, 10.4-bullseye, 10-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 392d8bf4ee9d494f03331c540c1f0d7f32259ff1
+GitCommit: e7e43ba8177ce15f473d9a799c9e69735e4dbab4
 Directory: 10
 
-Tags: 11.4.0, 11.4, 11, 11.4.0-bookworm, 11.4-bookworm, 11-bookworm
+Tags: 11.4.0, 11.4, 11, 11.4.0-bullseye, 11.4-bullseye, 11-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 8896a6fe1d596abcaea6c75c98337885ba4c27e8
+GitCommit: e7e43ba8177ce15f473d9a799c9e69735e4dbab4
 Directory: 11
 
 Tags: 12.3.0, 12.3, 12, 12.3.0-bookworm, 12.3-bookworm, 12-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 9677600371602a897f576cf1d85852a3a26f71af
+GitCommit: e7e43ba8177ce15f473d9a799c9e69735e4dbab4
 Directory: 12
 
 Tags: 13.1.0, 13.1, 13, latest, 13.1.0-bookworm, 13.1-bookworm, 13-bookworm, bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 46628bc0702798f6ff9f923650361f46f9eb2af2
+GitCommit: e7e43ba8177ce15f473d9a799c9e69735e4dbab4
 Directory: 13
diff --git a/_bashbrew-list b/_bashbrew-list
index 4b9d972..6a9b1b7 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,21 +1,21 @@
 gcc:9
-gcc:9-bookworm
+gcc:9-bullseye
 gcc:9.5
-gcc:9.5-bookworm
+gcc:9.5-bullseye
 gcc:9.5.0
-gcc:9.5.0-bookworm
+gcc:9.5.0-bullseye
 gcc:10
-gcc:10-bookworm
+gcc:10-bullseye
 gcc:10.4
-gcc:10.4-bookworm
+gcc:10.4-bullseye
 gcc:10.4.0
-gcc:10.4.0-bookworm
+gcc:10.4.0-bullseye
 gcc:11
-gcc:11-bookworm
+gcc:11-bullseye
 gcc:11.4
-gcc:11.4-bookworm
+gcc:11.4-bullseye
 gcc:11.4.0
-gcc:11.4.0-bookworm
+gcc:11.4.0-bullseye
 gcc:12
 gcc:12-bookworm
 gcc:12.3
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 995e7bc..2ab7426 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,5 +1,5 @@
-gcc:9-bookworm
-gcc:10-bookworm
-gcc:11-bookworm
+gcc:9-bullseye
+gcc:10-bullseye
+gcc:11-bullseye
 gcc:12-bookworm
 gcc:bookworm
diff --git a/gcc_10-bookworm/Dockerfile b/gcc_10-bullseye/Dockerfile
similarity index 91%
rename from gcc_10-bookworm/Dockerfile
rename to gcc_10-bullseye/Dockerfile
index eaab38e..d279280 100644
--- a/gcc_10-bookworm/Dockerfile
+++ b/gcc_10-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:bookworm
+FROM buildpack-deps:bullseye
 
 # https://gcc.gnu.org/mirrors.html
 ENV GPG_KEYS \
@@ -134,7 +134,15 @@ RUN set -ex; \
 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
+	ldconfig -v; \
+	# 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; \
diff --git a/gcc_11-bookworm/Dockerfile b/gcc_11-bullseye/Dockerfile
similarity index 91%
rename from gcc_11-bookworm/Dockerfile
rename to gcc_11-bullseye/Dockerfile
index e10d176..fb19efa 100644
--- a/gcc_11-bookworm/Dockerfile
+++ b/gcc_11-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:bookworm
+FROM buildpack-deps:bullseye
 
 # https://gcc.gnu.org/mirrors.html
 ENV GPG_KEYS \
@@ -135,7 +135,15 @@ RUN set -ex; \
 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
+	ldconfig -v; \
+	# 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; \
diff --git a/gcc_12-bookworm/Dockerfile b/gcc_12-bookworm/Dockerfile
index 0b1d83a..1045ea3 100644
--- a/gcc_12-bookworm/Dockerfile
+++ b/gcc_12-bookworm/Dockerfile
@@ -135,7 +135,15 @@ RUN set -ex; \
 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
+	ldconfig -v; \
+	# 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; \
diff --git a/gcc_9-bookworm/Dockerfile b/gcc_9-bullseye/Dockerfile
similarity index 91%
rename from gcc_9-bookworm/Dockerfile
rename to gcc_9-bullseye/Dockerfile
index c13edfc..987f5a8 100644
--- a/gcc_9-bookworm/Dockerfile
+++ b/gcc_9-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:bookworm
+FROM buildpack-deps:bullseye
 
 # https://gcc.gnu.org/mirrors.html
 ENV GPG_KEYS \
@@ -134,7 +134,15 @@ RUN set -ex; \
 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
+	ldconfig -v; \
+	# 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; \
diff --git a/gcc_bookworm/Dockerfile b/gcc_bookworm/Dockerfile
index 1b60e14..17ee403 100644
--- a/gcc_bookworm/Dockerfile
+++ b/gcc_bookworm/Dockerfile
@@ -135,7 +135,15 @@ RUN set -ex; \
 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
+	ldconfig -v; \
+	# 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; \

Relevant Maintainers:

@yosifkit yosifkit merged commit 3d33ba0 into docker-library:master Jun 24, 2023
@yosifkit yosifkit deleted the gcc branch June 24, 2023 00:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants