mirror of
https://github.com/telegramdesktop/tdesktop
synced 2025-01-21 23:04:18 +00:00
Revert "Update GCC to 13 in Docker"
This reverts commit 3adbfb1fb5
.
There is some problem with static libstdc++ linking in Release
configuration, the Updater utility fails with unresolved externals.
This commit is contained in:
parent
f53397e26a
commit
84c5310262
@ -24,14 +24,14 @@ RUN dnf -y install epel-release \
|
||||
&& dnf -y install autoconf automake libtool pkgconfig make patch git \
|
||||
python3.11-pip python3.11-devel gperf flex bison clang lld yasm \
|
||||
file which perl-open perl-XML-Parser xorg-x11-util-macros \
|
||||
gcc-toolset-13-gcc gcc-toolset-13-gcc-c++ gcc-toolset-13-binutils \
|
||||
gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ gcc-toolset-12-binutils \
|
||||
libffi-devel fontconfig-devel freetype-devel libX11-devel \
|
||||
alsa-lib-devel pulseaudio-libs-devel mesa-libGL-devel mesa-libEGL-devel \
|
||||
mesa-libgbm-devel libdrm-devel vulkan-devel libva-devel libvdpau-devel \
|
||||
glib2-devel at-spi2-core-devel gtk3-devel boost1.78-devel fmt-devel \
|
||||
&& dnf clean all
|
||||
|
||||
SHELL [ "bash", "-c", ". /opt/rh/gcc-toolset-13/enable; exec bash -c \"$@\"", "-s"]
|
||||
SHELL [ "bash", "-c", ". /opt/rh/gcc-toolset-12/enable; exec bash -c \"$@\"", "-s"]
|
||||
|
||||
WORKDIR {{ LibrariesPath }}
|
||||
|
||||
@ -906,5 +906,5 @@ ENV BOOST_INCLUDEDIR /usr/include/boost1.78
|
||||
ENV BOOST_LIBRARYDIR /usr/lib64/boost1.78
|
||||
|
||||
VOLUME [ "/usr/src/tdesktop" ]
|
||||
ENTRYPOINT [ "scl", "enable", "gcc-toolset-13", "--" ]
|
||||
ENTRYPOINT [ "scl", "enable", "gcc-toolset-12", "--" ]
|
||||
CMD [ "/usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh" ]
|
||||
|
Loading…
Reference in New Issue
Block a user