mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 22:46:10 +00:00
Code Issues Releases Wiki Activity

Migrate docker build to GCC 9.

Browse Source
This commit is contained in:
John Preston
2021-03-18 00:29:56 +04:00
parent 348b4d54ba
commit ebc67d25f0
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/ThirdParty/tgcalls vendored

Submodule Telegram/ThirdParty/tgcalls updated: f0fa9b3914...6549849146

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

@@ -16,7 +16,7 @@ if [ ! -d "$FullScriptPath/../../../../DesktopPrivate" ]; then
fi fi
Run () { Run () {
scl enable devtoolset-8 -- "$@" scl enable devtoolset-9 -- "$@"
} }
HomePath="$FullScriptPath/../.." HomePath="$FullScriptPath/../.."

8
Telegram/build/docker/centos_env/Dockerfile
View File

@@ -19,10 +19,10 @@ RUN yum -y install git cmake3 meson ninja-build autoconf automake libtool \
freetype-devel libX11-devel at-spi2-core-devel alsa-lib-devel \ freetype-devel libX11-devel at-spi2-core-devel alsa-lib-devel \
pulseaudio-libs-devel mesa-libGL-devel mesa-libEGL-devel \ pulseaudio-libs-devel mesa-libGL-devel mesa-libEGL-devel \
webkitgtk4-devel pkgconfig bison yasm file which xorg-x11-util-macros \ webkitgtk4-devel pkgconfig bison yasm file which xorg-x11-util-macros \
devtoolset-8-make devtoolset-8-gcc devtoolset-8-gcc-c++ \ devtoolset-9-make devtoolset-9-gcc devtoolset-9-gcc-c++ \
devtoolset-8-binutils devtoolset-9-binutils
SHELL [ "scl", "enable", "devtoolset-8", "--", "bash", "-c" ] SHELL [ "scl", "enable", "devtoolset-9", "--", "bash", "-c" ]
RUN ln -s cmake3 /usr/bin/cmake RUN ln -s cmake3 /usr/bin/cmake
ENV LibrariesPath /usr/src/Libraries ENV LibrariesPath /usr/src/Libraries
@@ -597,7 +597,7 @@ RUN git checkout bc8fb886
RUN git clone https://chromium.googlesource.com/linux-syscall-support.git src/third_party/lss RUN git clone https://chromium.googlesource.com/linux-syscall-support.git src/third_party/lss
WORKDIR src/third_party/lss WORKDIR src/third_party/lss
RUN git checkout a91633d1 RUN git checkout 8048ece
WORKDIR ${LibrariesPath} WORKDIR ${LibrariesPath}
ENV BreakpadCache ${LibrariesPath}/breakpad-cache ENV BreakpadCache ${LibrariesPath}/breakpad-cache

6
Telegram/build/docker/centos_env/build.sh
View File

@@ -1,10 +1,10 @@
#!/bin/bash #!/bin/bash
cd Telegram cd Telegram
scl enable devtoolset-8 -- ./configure.sh "$@" scl enable devtoolset-9 -- ./configure.sh "$@"
if [ -n "$DEBUG" ]; then if [ -n "$DEBUG" ]; then
scl enable devtoolset-8 -- cmake3 --build ../out/Debug -j$(nproc) scl enable devtoolset-9 -- cmake3 --build ../out/Debug -j$(nproc)
else else
scl enable devtoolset-8 -- cmake3 --build ../out/Release -j$(nproc) scl enable devtoolset-9 -- cmake3 --build ../out/Release -j$(nproc)
fi fi

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

@@ -15,7 +15,7 @@ fi
Command="$1" Command="$1"
if [ "$Command" == "" ]; then if [ "$Command" == "" ]; then
Command="scl enable devtoolset-8 -- bash" Command="scl enable devtoolset-9 -- bash"
fi 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 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