8283402: Update to gcc 11.2.0 on Linux

Backport-of: c7d3fd9
openjdk · Nov 22, 2022 · 76bbd59 · 76bbd59 · openjdk-notifier · Nov 22, 2022
1 parent 04b3232
commit 76bbd59
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml
@@ -83,8 +83,8 @@ jobs:
         run: |
           set -x
           sudo apt-get update
-          sudo apt-get install libgl1-mesa-dev libx11-dev libxxf86vm-dev libxt-dev pkg-config libgtk2.0-dev libgtk-3-dev libxtst-dev gcc-10=10.3.0-1ubuntu1~20.04 g++-10=10.3.0-1ubuntu1~20.04
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
+          sudo apt-get install libgl1-mesa-dev libx11-dev libxxf86vm-dev libxt-dev pkg-config libgtk2.0-dev libgtk-3-dev libxtst-dev gcc-11 g++-11
+          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 --slave /usr/bin/g++ g++ /usr/bin/g++-11
           mkdir -p "${HOME}/build-tools"
           wget -O "${HOME}/build-tools/${ANT_FILENAME}" "${ANT_URL}"
           tar -zxf "${HOME}/build-tools/${ANT_FILENAME}" -C "${HOME}/build-tools"

diff --git a/build.properties b/build.properties
@@ -88,7 +88,7 @@ jfx.gradle.version=7.3
 jfx.gradle.version.min=6.3
 
 # Toolchains
-jfx.build.linux.gcc.version=gcc10.3.0-OL6.4+1.0
+jfx.build.linux.gcc.version=gcc11.2.0-OL6.4+1.0
 jfx.build.windows.msvc.version=VS2022-17.1.0+1.0
 jfx.build.macosx.xcode.version=Xcode12.4+1.0
 

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -81,9 +81,9 @@
             <sha256 value="0018b369f06646d4784fad131a155333c9d59a03dee6390324f81b9df72a2f00" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="javafx" name="devkit-linux_x64-gcc10.3.0" version="OL6.4+1.0.tar">
-         <artifact name="devkit-linux_x64-gcc10.3.0-OL6.4+1.0.tar.gz">
-            <sha256 value="7bef73db375a81dd8daf8a63ee4a1f8f06dd3a063b85115e84a0dd52da22dca9" origin="Generated by Gradle"/>
+      <component group="javafx" name="devkit-linux_x64-gcc11.2.0" version="OL6.4+1.0.tar">
+         <artifact name="devkit-linux_x64-gcc11.2.0-OL6.4+1.0.tar.gz">
+            <sha256 value="db9ec01e1658d06fd7e94886e004c63591c1a43ba441f027b35670bcbad89873" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="javafx" name="devkit-macosx" version="Xcode12.4+1.0.tar">