From 605bdc92239ec0821073db2a5bd06e5354f142c6 Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Wed, 8 May 2024 17:06:07 -0700 Subject: [PATCH] Use cmake3 for Amazon Linux 2 Upstream in Vanagon in puppetlabs/vanagon@055c817, we changed Amazon Linux 2 to use the cmake3 package instead of cmake. This commit adds a case to the yaml-cpp component to refer to cmake3 when building on AL2 instead of cmake. --- configs/components/yaml-cpp.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configs/components/yaml-cpp.rb b/configs/components/yaml-cpp.rb index ce329c704..17a110757 100644 --- a/configs/components/yaml-cpp.rb +++ b/configs/components/yaml-cpp.rb @@ -4,9 +4,13 @@ # Build-time Configuration cmake_toolchain_file = '' - cmake = '/usr/bin/cmake' make = 'make' mkdir = 'mkdir' + cmake = if platform.name =~ /amazon-7-aarch64/ + '/usr/bin/cmake3' + else + 'cmake' + end if platform.is_cross_compiled_linux? # We're using the x86_64 version of cmake