void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-04-16 14:17:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch to devtoolset-10 in Docker.

Browse source
This commit is contained in:
John Preston 2021-11-10 11:51:35 +04:00
parent 80fe3d732a
commit a02642b917
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/build/docker/build.sh
View file

@ -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/../.."

6
Telegram/build/docker/centos_env/Dockerfile
View file

@ -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"

2
Telegram/build/docker/centos_env/build.sh
View file

@ -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 "$@"

2
Telegram/build/docker/centos_env/run.sh
View file

@ -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