Updating Jammy(Ubuntu 22.04) C/C++ versions (#340)

etcwilde · web-flow · commit b39c77002924 · 2023-05-18T10:34:40.000-07:00
Ubuntu 22.04 tools use gcc-11 aligned C/C++ libraries and runtimes as
built by the distribution. The package for gcc-9 aligned versions are
available, but installing any tool (e.g libtool) from the official
repositories will install gcc-11 aligned runtimes. Clang will see this
version instead and go looking for the C++ headers that match the latest
version of gcc, which is 11. The tools don't necessarily install the
libstdc++-11 headers though, so clang will fail to find things like
iostream and friends. Swift runs and builds fine with the newer C++
library, so I'm updating all 22.04-aligned swift dockerfiles with the
version used by the system natively.
diff --git a/5.7/ubuntu/22.04/Dockerfile b/5.7/ubuntu/22.04/Dockerfile
@@ -11,10 +11,10 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
     libc6-dev \
     libcurl4-openssl-dev \
     libedit2 \
-    libgcc-9-dev \
+    libgcc-11-dev \
     libpython3-dev \
     libsqlite3-0 \
-    libstdc++-9-dev \
+    libstdc++-11-dev \
     libxml2-dev \
     libz3-dev \
     pkg-config \
diff --git a/5.8/ubuntu/22.04/Dockerfile b/5.8/ubuntu/22.04/Dockerfile
@@ -11,10 +11,10 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
     libc6-dev \
     libcurl4-openssl-dev \
     libedit2 \
-    libgcc-9-dev \
+    libgcc-11-dev \
     libpython3-dev \
     libsqlite3-0 \
-    libstdc++-9-dev \
+    libstdc++-11-dev \
     libxml2-dev \
     libz3-dev \
     pkg-config \
diff --git a/nightly-5.7/ubuntu/22.04/Dockerfile b/nightly-5.7/ubuntu/22.04/Dockerfile
@@ -11,10 +11,10 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
     libc6-dev \
     libcurl4-openssl-dev \
     libedit2 \
-    libgcc-9-dev \
+    libgcc-11-dev \
     libpython3-dev \
     libsqlite3-0 \
-    libstdc++-9-dev \
+    libstdc++-11-dev \
     libxml2-dev \
     libz3-dev \
     pkg-config \
diff --git a/nightly-5.7/ubuntu/22.04/buildx/Dockerfile b/nightly-5.7/ubuntu/22.04/buildx/Dockerfile
@@ -11,10 +11,10 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
     libc6-dev \
     libcurl4-openssl-dev \
     libedit2 \
-    libgcc-9-dev \
+    libgcc-11-dev \
     libpython3-dev \
     libsqlite3-0 \
-    libstdc++-9-dev \
+    libstdc++-11-dev \
     libxml2-dev \
     libz3-dev \
     pkg-config \
diff --git a/nightly-5.8/ubuntu/22.04/Dockerfile b/nightly-5.8/ubuntu/22.04/Dockerfile
@@ -10,10 +10,10 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
     libc6-dev \
     libcurl4-openssl-dev \
     libedit2 \
-    libgcc-9-dev \
+    libgcc-11-dev \
     libpython3-dev \
     libsqlite3-0 \
-    libstdc++-9-dev \
+    libstdc++-11-dev \
     libxml2-dev \
     libz3-dev \
     pkg-config \
diff --git a/nightly-5.8/ubuntu/22.04/buildx/Dockerfile b/nightly-5.8/ubuntu/22.04/buildx/Dockerfile
@@ -10,10 +10,10 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
     libc6-dev \
     libcurl4-openssl-dev \
     libedit2 \
-    libgcc-9-dev \
+    libgcc-11-dev \
     libpython3-dev \
     libsqlite3-0 \
-    libstdc++-9-dev \
+    libstdc++-11-dev \
     libxml2-dev \
     libz3-dev \
     pkg-config \
diff --git a/nightly-5.9/ubuntu/22.04/Dockerfile b/nightly-5.9/ubuntu/22.04/Dockerfile
@@ -10,10 +10,10 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
     libc6-dev \
     libcurl4-openssl-dev \
     libedit2 \
-    libgcc-9-dev \
+    libgcc-11-dev \
     libpython3-dev \
     libsqlite3-0 \
-    libstdc++-9-dev \
+    libstdc++-11-dev \
     libxml2-dev \
     libz3-dev \
     pkg-config \
diff --git a/nightly-5.9/ubuntu/22.04/buildx/Dockerfile b/nightly-5.9/ubuntu/22.04/buildx/Dockerfile
@@ -10,10 +10,10 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
     libc6-dev \
     libcurl4-openssl-dev \
     libedit2 \
-    libgcc-9-dev \
+    libgcc-11-dev \
     libpython3-dev \
     libsqlite3-0 \
-    libstdc++-9-dev \
+    libstdc++-11-dev \
     libxml2-dev \
     libz3-dev \
     pkg-config \
diff --git a/nightly-main/ubuntu/22.04/Dockerfile b/nightly-main/ubuntu/22.04/Dockerfile
@@ -10,10 +10,10 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
     libc6-dev \
     libcurl4-openssl-dev \
     libedit2 \
-    libgcc-9-dev \
+    libgcc-11-dev \
     libpython3-dev \
     libsqlite3-0 \
-    libstdc++-9-dev \
+    libstdc++-11-dev \
     libxml2-dev \
     libz3-dev \
     pkg-config \
diff --git a/nightly-main/ubuntu/22.04/buildx/Dockerfile b/nightly-main/ubuntu/22.04/buildx/Dockerfile
@@ -10,10 +10,10 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
     libc6-dev \
     libcurl4-openssl-dev \
     libedit2 \
-    libgcc-9-dev \
+    libgcc-11-dev \
     libpython3-dev \
     libsqlite3-0 \
-    libstdc++-9-dev \
+    libstdc++-11-dev \
     libxml2-dev \
     libz3-dev \
     pkg-config \
