Switch to devtoolset-10 in Docker.
This commit is contained in:
parent
80fe3d732a
commit
a02642b917
|
@ -16,7 +16,7 @@ if [ ! -d "$FullScriptPath/../../../../DesktopPrivate" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
Run () {
|
Run () {
|
||||||
scl enable llvm-toolset-7.0 -- scl enable devtoolset-9 -- "$@"
|
scl enable llvm-toolset-7.0 -- scl enable devtoolset-10 -- "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
HomePath="$FullScriptPath/../.."
|
HomePath="$FullScriptPath/../.."
|
||||||
|
|
|
@ -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 \
|
fontconfig-devel freetype-devel libX11-devel at-spi2-core-devel alsa-lib-devel \
|
||||||
pulseaudio-libs-devel mesa-libGL-devel mesa-libEGL-devel libudev-devel \
|
pulseaudio-libs-devel mesa-libGL-devel mesa-libEGL-devel libudev-devel \
|
||||||
webkitgtk4-devel pkgconfig bison yasm file which xorg-x11-util-macros \
|
webkitgtk4-devel pkgconfig bison yasm file which xorg-x11-util-macros \
|
||||||
devtoolset-9-make devtoolset-9-gcc devtoolset-9-gcc-c++ \
|
devtoolset-10-make devtoolset-10-gcc devtoolset-10-gcc-c++ \
|
||||||
devtoolset-9-binutils llvm-toolset-7.0 llvm-toolset-7.0-clang-devel \
|
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
|
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 LibrariesPath /usr/src/Libraries
|
||||||
ENV HFLAGS "-fstack-protector-all -fstack-clash-protection -fPIC -D_FORTIFY_SOURCE=2"
|
ENV HFLAGS "-fstack-protector-all -fstack-clash-protection -fPIC -D_FORTIFY_SOURCE=2"
|
||||||
|
|
|
@ -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
|
cd Telegram
|
||||||
./configure.sh "$@"
|
./configure.sh "$@"
|
||||||
|
|
|
@ -15,7 +15,7 @@ fi
|
||||||
|
|
||||||
Command="$1"
|
Command="$1"
|
||||||
if [ "$Command" == "" ]; then
|
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
|
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
|
||||||
|
|
Loading…
Reference in New Issue