Use GCC 11 to build Traffic Server

zrhoffman · Aug 14, 2023 · bc4f3a2 · bc4f3a2
1 parent f8d72a9
commit bc4f3a2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/cache-config/testing/docker/trafficserver/Dockerfile b/cache-config/testing/docker/trafficserver/Dockerfile
@@ -61,17 +61,16 @@ RUN if [[ ${OS_VERSION%%.*} -ge 8 ]]; then \
 			brotli \
 			brotli-devel \
 			curl \
-			gcc-toolset-9 \
-			gcc-toolset-9-runtime \
+			gcc-toolset-11 \
+			gcc-toolset-11-runtime \
 			geoip \
 			jansson \
 			jansson-devel \
 			libmaxminddb \
 			libmaxminddb-devel \
 			libuuid ); \
-		os_toolset="gcc-toolset-9"; \
 	else \
-		os_pkgs=(devtoolset-9); \
+		os_pkgs=(devtoolset-11); \
 	fi \
 	&& yum install -y \
 		${os_pkgs[*]} \

diff --git a/cache-config/testing/docker/trafficserver/run.sh b/cache-config/testing/docker/trafficserver/run.sh
@@ -78,9 +78,9 @@ id ats &>/dev/null || /usr/sbin/useradd -u 176 -r ats -s /sbin/nologin -d /
 
 # setup the environment to use the devtoolset-9 tools.
 if [ "${OS_VERSION%%.*}" -le 7 ]; then 
-  source scl_source enable devtoolset-9
+  source scl_source enable devtoolset-11
 else
-  source scl_source enable gcc-toolset-9
+  source scl_source enable gcc-toolset-11
 fi
 
 cd /root

diff --git a/traffic_server/_tsb/Dockerfile b/traffic_server/_tsb/Dockerfile
@@ -54,16 +54,16 @@ RUN if [[ ${RHEL_VERSION%%.*} -ge 8 ]]; then \
 			brotli \
 			brotli-devel \
 			curl \
-			gcc-toolset-9 \
-			gcc-toolset-9-runtime \
+			gcc-toolset-11 \
+			gcc-toolset-11-runtime \
 			jansson \
 			jansson-devel \
 			libmaxminddb \
 			libmaxminddb-devel); \
-		os_toolset="gcc-toolset-9"; \
+		os_toolset="gcc-toolset-11"; \
 	else \
-		os_pkgs=(devtoolset-7); \
-		os_toolset="devtoolset-7"; \
+		os_pkgs=(devtoolset-11); \
+		os_toolset="devtoolset-11"; \
 	fi \
 	&& yum install -y \
 		${os_pkgs[*]} \
@@ -109,7 +109,7 @@ COPY	trafficserver.spec /rpmbuilddir/SPECS/trafficserver.spec
 COPY	traffic_server_jemalloc /rpmbuilddir/SOURCES/traffic_server_jemalloc
 RUN	/usr/sbin/useradd -u 176 -r ats -s /sbin/nologin -d /
 CMD if [[ ${RHEL_VERSION%%.*} -ge 8 ]]; then \
-		os_toolset=gcc-toolset-9; \
+		os_toolset=gcc-toolset-11; \
 		openssl_included='--without_openssl'; \
 	else \
 		os_toolset=devtoolset-7; \