Update gcc #17229
Merged
Update gcc #17229
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/gcc@3583d3c: Merge pull request docker-library/gcc#108 from infosiftr/eol-11 - docker-library/gcc@b5055bc: Remove EOL 11
Diff for bdd0ec9:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 4911623..ea6e2a4 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,22 +1,17 @@
Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
GitRepo: https://github.com/docker-library/gcc.git
-Tags: 11.5.0, 11.5, 11, 11.5.0-bullseye, 11.5-bullseye, 11-bullseye
-Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: f2681d9a12524b97ffe225a35d2c2f9f839cff0a
-Directory: 11
-
Tags: 12.4.0, 12.4, 12, 12.4.0-bookworm, 12.4-bookworm, 12-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 4a0eb64954fed9990b723b618fa13f6b8f7762e3
+GitCommit: b5055bcc1551a7e271af315158e1c260c212409c
Directory: 12
Tags: 13.3.0, 13.3, 13, 13.3.0-bookworm, 13.3-bookworm, 13-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: dfd9a5f296cd45762afd9b9e098d293b12dc5193
+GitCommit: b5055bcc1551a7e271af315158e1c260c212409c
Directory: 13
Tags: 14.1.0, 14.1, 14, latest, 14.1.0-bookworm, 14.1-bookworm, 14-bookworm, bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: dfd9a5f296cd45762afd9b9e098d293b12dc5193
+GitCommit: b5055bcc1551a7e271af315158e1c260c212409c
Directory: 14
diff --git a/_bashbrew-list b/_bashbrew-list
index 7656ab9..aff3eea 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,9 +1,3 @@
-gcc:11
-gcc:11-bullseye
-gcc:11.5
-gcc:11.5-bullseye
-gcc:11.5.0
-gcc:11.5.0-bullseye
gcc:12
gcc:12-bookworm
gcc:12.4
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 79ed6ee..d2daf60 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,4 +1,3 @@
-gcc:11-bullseye
gcc:12-bookworm
gcc:13-bookworm
gcc:bookworm
diff --git a/gcc_11-bullseye/Dockerfile b/gcc_11-bullseye/Dockerfile
deleted file mode 100644
index afd7989..0000000
diff --git a/gcc_12-bookworm/Dockerfile b/gcc_12-bookworm/Dockerfile
index e31cde7..369b2db 100644
--- a/gcc_12-bookworm/Dockerfile
+++ b/gcc_12-bookworm/Dockerfile
@@ -103,9 +103,9 @@ 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
+# 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" \
;; \
@@ -114,7 +114,7 @@ RUN set -ex; \
extraConfigureArgs="$extraConfigureArgs --with-arch=armv7-a+fp --with-float=hard --with-mode=thumb" \
;; \
\
-# 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"; \
;; \
diff --git a/gcc_13-bookworm/Dockerfile b/gcc_13-bookworm/Dockerfile
index ee8540b..98685ee 100644
--- a/gcc_13-bookworm/Dockerfile
+++ b/gcc_13-bookworm/Dockerfile
@@ -103,9 +103,9 @@ 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
+# 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" \
;; \
@@ -114,7 +114,7 @@ RUN set -ex; \
extraConfigureArgs="$extraConfigureArgs --with-arch=armv7-a+fp --with-float=hard --with-mode=thumb" \
;; \
\
-# 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"; \
;; \
diff --git a/gcc_bookworm/Dockerfile b/gcc_bookworm/Dockerfile
index 37882cc..599653a 100644
--- a/gcc_bookworm/Dockerfile
+++ b/gcc_bookworm/Dockerfile
@@ -103,9 +103,9 @@ 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
+# 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" \
;; \
@@ -114,7 +114,7 @@ RUN set -ex; \
extraConfigureArgs="$extraConfigureArgs --with-arch=armv7-a+fp --with-float=hard --with-mode=thumb" \
;; \
\
-# 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"; \
;; \Relevant Maintainers: |
|
The comment updates mean this will cause rebuilds of the other versions too, but on the flip side, if we don't merge this, we'll rebuild 11 for every base image update, so IMO we should pay the short term pain instead of the longer term. |
|
Plus, if we merge it along with the Debian update (#17227), then they'll have rebuilt anyway. |
yosifkit
approved these changes
Jul 22, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: