From 06d84d1d5b3b456e2136025ed910ed64c628c13d Mon Sep 17 00:00:00 2001 From: Florent Rougon Date: Tue, 9 Apr 2019 10:29:07 +0200 Subject: [PATCH] download_and_compile.sh: don't install CMake from distro package when we build it Don't install the 'cmake' distro package when the CMAKE component has been selected. --- download_and_compile.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index 36075ec..6a5e4f0 100755 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -601,13 +601,15 @@ if [[ "$DOWNLOAD_PACKAGES" = "y" ]]; then fi # Minimum - PKG=(build-essential cmake git) + PKG=(build-essential git) _mandatory_pkg_alternative libcurl4-openssl-dev libcurl4-gnutls-dev # CMake if _elementIn "CMAKE" "${WHATTOBUILD[@]}"; then PKG+=(libarchive-dev libbz2-dev libexpat1-dev libjsoncpp-dev liblzma-dev libncurses5-dev procps zlib1g-dev) + else + PKG+=(cmake) fi # TerraGear