File tree Expand file tree Collapse file tree 1 file changed +9
-6
lines changed Expand file tree Collapse file tree 1 file changed +9
-6
lines changed Original file line number Diff line number Diff line change @@ -94,12 +94,6 @@ if [ "$dist" = "focal" ]; then
94
94
# Install gcc-10 and g++-10 which are required in case of Ubuntu Focal to support Ranges library, introduced in C++20
95
95
schroot -c source:${dist} -${arch} -sbuild -d / -- bash -c " apt update && apt remove -y gcc-9 g++-9 gcc-9-base && apt upgrade -yqq && apt install -y gcc build-essential gcc-10 g++-10 clang-format clang lcov openssl"
96
96
schroot -c source:${dist} -${arch} -sbuild -d / -- bash -c " [ -f /usr/bin/gcc-10 ] && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 60 --slave /usr/bin/g++ g++ /usr/bin/g++-10|| echo 'gcc-10 installation failed'"
97
-
98
- # Install latest CMake version using pip for amd64 and arm64 architectures
99
- schroot -c source:${dist} -${arch} -sbuild -d / -- bash -c " apt install -y python3-pip && \
100
- pip3 install cmake==3.31.6 && \
101
- ln -sf /usr/local/bin/cmake /usr/bin/cmake && \
102
- cmake --version"
103
97
104
98
# Install newer version of debhelper
105
99
# Required because of a bug: https://bugs-devel.debian.org/cgi-bin/bugreport.cgi?bug=959731
@@ -110,3 +104,12 @@ if [ "$dist" = "focal" ]; then
110
104
|| apt-get -yf install"
111
105
schroot -c source:${dist} -${arch} -sbuild -d / -- bash -c " $INSTALL_DEBHELPER_FROM_BULLSEYE "
112
106
fi
107
+
108
+ # Install latest CMake version for Focal, Jammy and Bullseye
109
+ if [ " $dist " = " focal" ] || [ " $dist " = " jammy" ] || [ " $dist " = " bullseye" ]; then
110
+ schroot -c source:${dist} -${arch} -sbuild -d / -- bash -c " apt install -y python3-pip && \
111
+ python3 -m pip install --upgrade pip && \
112
+ python3 -m pip install cmake==3.31.6 && \
113
+ ln -sf /usr/local/bin/cmake /usr/bin/cmake && \
114
+ cmake --version"
115
+ fi
You can’t perform that action at this time.
0 commit comments