Skip to content

Commit 1e287c2

Browse files
authored
Merge pull request ansible#737 from Jakuje/update-cmake
2 parents cd2970f + 293d5b0 commit 1e287c2

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

build-scripts/manylinux-container-image/install-userspace-tools.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,7 @@ PYTHON_INTERPRETER=/opt/python/cp39-cp39/bin/python
1111
VIRTUALENV_PYTHON_BIN="${USERSPACE_VENV_BIN_PATH}/python"
1212
VIRTUALENV_PIP_BIN="${VIRTUALENV_PYTHON_BIN} -m pip"
1313

14-
# NOTE: Cmake removed compatibility with `cmake < 3.5` that
15-
# NOTE: libssh 0.9.6 is set up to require.
16-
# NOTE: So this patch limits the version of `cmake` we install.
17-
#
18-
# Ref: https://github.com/eclipse-ecal/ecal/issues/2041
19-
# FIXME: Drop the restriction once libssh is bumped to v0.11 series.
20-
TOOLS_PKGS="auditwheel cmake<4 --only-binary=cmake"
14+
TOOLS_PKGS="auditwheel cmake --only-binary=cmake"
2115

2216
# Avoid creation of __pycache__/*.py[c|o]
2317
export PYTHONDONTWRITEBYTECODE=1
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Reverted workaround keeping the old CMake version installed
2+
as the new ``libssh`` works with newer versions -- by :user:`Jakuje`.

0 commit comments

Comments
 (0)