From cf053c072ef41741f36f3fab7071dc7ecfdab22f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Tue, 28 Jan 2025 16:34:24 +0100 Subject: [PATCH] Revert Required CMake on minimal build example and install cmake manually to amazon-linux-2023, ubuntu-focal and ubuntu-jammy --- cpp/examples/minimal_build/CMakeLists.txt | 2 +- .../linux-packages/apache-arrow/apt/ubuntu-focal/Dockerfile | 6 ++++++ .../linux-packages/apache-arrow/apt/ubuntu-jammy/Dockerfile | 6 ++++++ .../apache-arrow/yum/amazon-linux-2023/Dockerfile | 6 ++++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/cpp/examples/minimal_build/CMakeLists.txt b/cpp/examples/minimal_build/CMakeLists.txt index 689dba437e033..95dad34221add 100644 --- a/cpp/examples/minimal_build/CMakeLists.txt +++ b/cpp/examples/minimal_build/CMakeLists.txt @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -cmake_minimum_required(VERSION 3.25) +cmake_minimum_required(VERSION 3.16) project(ArrowMinimalExample) diff --git a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-focal/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-focal/Dockerfile index fe783638b6344..2927554c4f440 100644 --- a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-focal/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-focal/Dockerfile @@ -79,3 +79,9 @@ RUN \ ln -fs /usr/local/bin/gi-docgen /usr/bin && \ apt clean && \ rm -rf /var/lib/apt/lists/* + +ARG cmake=3.25.0 +RUN curl -L \ + "https://github.com/Kitware/CMake/releases/download/v${cmake}/cmake-${cmake}-linux-$(uname -m).tar.gz" | \ + tar -xzf - --directory /usr/local --strip-components=1 && \ + ln -fs /usr/local/bin/cmake /usr/bin/cmake diff --git a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-jammy/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-jammy/Dockerfile index 1d9065d6b2e61..c8bc067f56b09 100644 --- a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-jammy/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-jammy/Dockerfile @@ -82,3 +82,9 @@ RUN \ fi && \ apt clean && \ rm -rf /var/lib/apt/lists/* + +ARG cmake=3.25.0 +RUN curl -L \ + "https://github.com/Kitware/CMake/releases/download/v${cmake}/cmake-${cmake}-linux-$(uname -m).tar.gz" | \ + tar -xzf - --directory /usr/local --strip-components=1 && \ + ln -fs /usr/local/bin/cmake /usr/bin/cmake diff --git a/dev/tasks/linux-packages/apache-arrow/yum/amazon-linux-2023/Dockerfile b/dev/tasks/linux-packages/apache-arrow/yum/amazon-linux-2023/Dockerfile index a19641f8f961d..a5664dbbbe9e4 100644 --- a/dev/tasks/linux-packages/apache-arrow/yum/amazon-linux-2023/Dockerfile +++ b/dev/tasks/linux-packages/apache-arrow/yum/amazon-linux-2023/Dockerfile @@ -60,3 +60,9 @@ RUN \ which \ zlib-devel && \ dnf clean ${quiet} all + +ARG cmake=3.25.0 +RUN curl -L \ + "https://github.com/Kitware/CMake/releases/download/v${cmake}/cmake-${cmake}-linux-$(uname -m).tar.gz" | \ + tar -xzf - --directory /usr/local --strip-components=1 && \ + ln -fs /usr/local/bin/cmake /usr/bin/cmake