From ee8c6f68d7038b524ae67db8b319a75e95ca9dac Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 12 Sep 2021 01:04:07 +0400 Subject: [PATCH] Use clang to build jemalloc since it crashes with gcc --- Telegram/build/docker/centos_env/Dockerfile | 2 ++ Telegram/build/docker/centos_env/build.sh | 8 ++++---- snap/snapcraft.yaml | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index eeb5cb87b..50ac9bfb9 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -868,6 +868,8 @@ COPY --from=breakpad ${LibrariesPath}/breakpad breakpad COPY --from=breakpad ${LibrariesPath}/breakpad-cache / COPY --from=webrtc ${LibrariesPath}/tg_owt tg_owt +RUN yum -y install llvm-toolset-7.0 llvm-toolset-7.0-clang-devel llvm-toolset-7.0-llvm-devel + WORKDIR ../tdesktop VOLUME [ "/usr/src/tdesktop" ] CMD [ "/usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh" ] diff --git a/Telegram/build/docker/centos_env/build.sh b/Telegram/build/docker/centos_env/build.sh index c965b47d2..90615e323 100755 --- a/Telegram/build/docker/centos_env/build.sh +++ b/Telegram/build/docker/centos_env/build.sh @@ -1,10 +1,10 @@ -#!/bin/bash +#!/usr/bin/scl enable llvm-toolset-7.0 -- scl enable devtoolset-9 -- bash cd Telegram -scl enable devtoolset-9 -- ./configure.sh "$@" +./configure.sh "$@" if [ -n "$DEBUG" ]; then - scl enable devtoolset-9 -- cmake3 --build ../out/Debug -j$(nproc) + cmake3 --build ../out/Debug -j$(nproc) else - scl enable devtoolset-9 -- cmake3 --build ../out/Release -j$(nproc) + cmake3 --build ../out/Release -j$(nproc) fi diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 7ea662299..b5147e958 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -85,6 +85,7 @@ parts: build-environment: - LD_LIBRARY_PATH: $SNAPCRAFT_STAGE/usr/lib/$SNAPCRAFT_ARCH_TRIPLET:$LD_LIBRARY_PATH build-packages: + - clang - python - libasound2-dev - libglib2.0-dev