void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use clang to build jemalloc since it crashes with gcc

Browse source
This commit is contained in:
Ilya Fedin 2021-09-12 01:04:07 +04:00 • committed by John Preston
parent 8d4174afb5
commit ee8c6f68d7
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -868,6 +868,8 @@ COPY --from=breakpad ${LibrariesPath}/breakpad breakpad
COPY --from=breakpad ${LibrariesPath}/breakpad-cache / COPY --from=breakpad ${LibrariesPath}/breakpad-cache /
COPY --from=webrtc ${LibrariesPath}/tg_owt tg_owt 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 WORKDIR ../tdesktop
VOLUME [ "/usr/src/tdesktop" ] VOLUME [ "/usr/src/tdesktop" ]
CMD [ "/usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh" ] CMD [ "/usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh" ]

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

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

1
snap/snapcraft.yaml
View file

@ -85,6 +85,7 @@ parts:
build-environment: build-environment:
- LD_LIBRARY_PATH: $SNAPCRAFT_STAGE/usr/lib/$SNAPCRAFT_ARCH_TRIPLET:$LD_LIBRARY_PATH - LD_LIBRARY_PATH: $SNAPCRAFT_STAGE/usr/lib/$SNAPCRAFT_ARCH_TRIPLET:$LD_LIBRARY_PATH
build-packages: build-packages:
- clang
- python - python
- libasound2-dev - libasound2-dev
- libglib2.0-dev - libglib2.0-dev