From 483591ff43cb310c330b744935d11743fe0d5fd8 Mon Sep 17 00:00:00 2001 From: Maqsood Ahmad Date: Tue, 7 May 2024 23:20:12 +0530 Subject: [PATCH] (PA-6262) Bumping up cmake version to 3 for amazon-7-aarch64 --- configs/components/cpp-hocon.rb | 6 +++++- configs/components/cpp-pcp-client.rb | 6 +++++- configs/components/leatherman.rb | 6 +++++- configs/components/pxp-agent.rb | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/configs/components/cpp-hocon.rb b/configs/components/cpp-hocon.rb index 75d9806..090cc9c 100644 --- a/configs/components/cpp-hocon.rb +++ b/configs/components/cpp-hocon.rb @@ -56,10 +56,14 @@ # These platforms use the default OS toolchain, rather than pl-build-tools pkg.environment 'CPPFLAGS', settings[:cppflags] pkg.environment 'LDFLAGS', settings[:ldflags] - cmake = 'cmake' toolchain = '' boost_static_flag = '-DBOOST_STATIC=OFF' special_flags = " -DENABLE_CXX_WERROR=OFF -DCMAKE_CXX_FLAGS='#{settings[:cflags]}'" + cmake = if platform.name =~ /amazon-7-aarch64/ + '/usr/bin/cmake3' + else + 'cmake' + end end # Until we build our own gettext packages, disable using locales. diff --git a/configs/components/cpp-pcp-client.rb b/configs/components/cpp-pcp-client.rb index 483057f..774ff88 100644 --- a/configs/components/cpp-pcp-client.rb +++ b/configs/components/cpp-pcp-client.rb @@ -68,10 +68,14 @@ # These platforms use the default OS toolchain, rather than pl-build-tools pkg.environment 'CPPFLAGS', settings[:cppflags] pkg.environment 'LDFLAGS', settings[:ldflags] - cmake = 'cmake' toolchain = '' platform_flags = "-DCMAKE_CXX_FLAGS='#{settings[:cflags]} -Wimplicit-fallthrough=0'" special_flags = ' -DENABLE_CXX_WERROR=OFF' + cmake = if platform.name =~ /amazon-7-aarch64/ + '/usr/bin/cmake3' + else + 'cmake' + end end # Boost_NO_BOOST_CMAKE=ON was added while upgrading to boost diff --git a/configs/components/leatherman.rb b/configs/components/leatherman.rb index 644d678..0498a59 100644 --- a/configs/components/leatherman.rb +++ b/configs/components/leatherman.rb @@ -106,12 +106,16 @@ # These platforms use the default OS toolchain, rather than pl-build-tools pkg.environment 'CPPFLAGS', settings[:cppflags] pkg.environment 'LDFLAGS', settings[:ldflags] - cmake = 'cmake' toolchain = '' boost_static_flag = '' # Workaround for hanging leatherman tests (-fno-strict-overflow) special_flags = " -DENABLE_CXX_WERROR=OFF -DCMAKE_CXX_FLAGS='#{settings[:cflags]} -fno-strict-overflow -Wno-deprecated-declarations' " + cmake = if platform.name =~ /amazon-7-aarch64/ + '/usr/bin/cmake3' + else + 'cmake' + end end if platform.is_linux? diff --git a/configs/components/pxp-agent.rb b/configs/components/pxp-agent.rb index 25ee389..d8a9c65 100644 --- a/configs/components/pxp-agent.rb +++ b/configs/components/pxp-agent.rb @@ -79,10 +79,14 @@ special_flags += "-DCMAKE_CXX_FLAGS='#{settings[:cflags]}' -DENABLE_CXX_WERROR=OFF" else # These platforms use the default OS toolchain, rather than pl-build-tools - cmake = 'cmake' toolchain = '' special_flags += " -DCMAKE_CXX_FLAGS='#{settings[:cflags]} -Wno-deprecated -Wimplicit-fallthrough=0' " special_flags += ' -DENABLE_CXX_WERROR=OFF ' unless platform.name =~ /sles-15/ + cmake = if platform.name =~ /amazon-7-aarch64/ + '/usr/bin/cmake3' + else + 'cmake' + end end # Boost_NO_BOOST_CMAKE=ON was added while upgrading to boost