From a02642b91773e23b6db229b523aca64f7c68143d Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 10 Nov 2021 11:51:35 +0400 Subject: [PATCH] Switch to devtoolset-10 in Docker. --- Telegram/build/docker/build.sh | 2 +- Telegram/build/docker/centos_env/Dockerfile | 6 +++--- Telegram/build/docker/centos_env/build.sh | 2 +- Telegram/build/docker/centos_env/run.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Telegram/build/docker/build.sh b/Telegram/build/docker/build.sh index 3c8e19e6a8..54b00360bd 100755 --- a/Telegram/build/docker/build.sh +++ b/Telegram/build/docker/build.sh @@ -16,7 +16,7 @@ if [ ! -d "$FullScriptPath/../../../../DesktopPrivate" ]; then fi Run () { - scl enable llvm-toolset-7.0 -- scl enable devtoolset-9 -- "$@" + scl enable llvm-toolset-7.0 -- scl enable devtoolset-10 -- "$@" } HomePath="$FullScriptPath/../.." diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 3d33100d35..239eda02be 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -28,11 +28,11 @@ RUN yum -y install git meson ninja-build autoconf automake libtool \ fontconfig-devel freetype-devel libX11-devel at-spi2-core-devel alsa-lib-devel \ pulseaudio-libs-devel mesa-libGL-devel mesa-libEGL-devel libudev-devel \ webkitgtk4-devel pkgconfig bison yasm file which xorg-x11-util-macros \ - devtoolset-9-make devtoolset-9-gcc devtoolset-9-gcc-c++ \ - devtoolset-9-binutils llvm-toolset-7.0 llvm-toolset-7.0-clang-devel \ + devtoolset-10-make devtoolset-10-gcc devtoolset-10-gcc-c++ \ + devtoolset-10-binutils llvm-toolset-7.0 llvm-toolset-7.0-clang-devel \ llvm-toolset-7.0-llvm-devel perl-XML-Parser && yum clean all -SHELL [ "bash", "-c", ". /opt/rh/devtoolset-9/enable; exec bash -c \"$@\"", "-s"] +SHELL [ "bash", "-c", ". /opt/rh/devtoolset-10/enable; exec bash -c \"$@\"", "-s"] ENV LibrariesPath /usr/src/Libraries ENV HFLAGS "-fstack-protector-all -fstack-clash-protection -fPIC -D_FORTIFY_SOURCE=2" diff --git a/Telegram/build/docker/centos_env/build.sh b/Telegram/build/docker/centos_env/build.sh index 7eebb7fb7a..28f0002026 100755 --- a/Telegram/build/docker/centos_env/build.sh +++ b/Telegram/build/docker/centos_env/build.sh @@ -1,4 +1,4 @@ -#!/usr/bin/scl enable llvm-toolset-7.0 -- scl enable devtoolset-9 -- bash +#!/usr/bin/scl enable llvm-toolset-7.0 -- scl enable devtoolset-10 -- bash cd Telegram ./configure.sh "$@" diff --git a/Telegram/build/docker/centos_env/run.sh b/Telegram/build/docker/centos_env/run.sh index 4d1451f7a8..3df128dedc 100755 --- a/Telegram/build/docker/centos_env/run.sh +++ b/Telegram/build/docker/centos_env/run.sh @@ -15,7 +15,7 @@ fi Command="$1" if [ "$Command" == "" ]; then - Command="scl enable llvm-toolset-7.0 -- scl enable devtoolset-9 -- bash" + Command="scl enable llvm-toolset-7.0 -- scl enable devtoolset-10 -- bash" fi docker run -it --rm --cpus=8 --memory=22g -v $HOME/Telegram/DesktopPrivate:/usr/src/DesktopPrivate -v $HOME/Telegram/tdesktop:/usr/src/tdesktop tdesktop:centos_env $Command