Skip to content

Commit 06d8a46

Browse files
committed
Update cmake version for jammy and bullseye
1 parent 8e79bef commit 06d8a46

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

setup_sbuild.sh

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,6 @@ if [ "$dist" = "focal" ]; then
9494
# Install gcc-10 and g++-10 which are required in case of Ubuntu Focal to support Ranges library, introduced in C++20
9595
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"
9696
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"
10397

10498
# Install newer version of debhelper
10599
# Required because of a bug: https://bugs-devel.debian.org/cgi-bin/bugreport.cgi?bug=959731
@@ -110,3 +104,12 @@ if [ "$dist" = "focal" ]; then
110104
|| apt-get -yf install"
111105
schroot -c source:${dist}-${arch}-sbuild -d / -- bash -c "$INSTALL_DEBHELPER_FROM_BULLSEYE"
112106
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

0 commit comments

Comments
 (0)