From b1af9fcc4adb07fa6ae5eb4863d4285a667a32fe Mon Sep 17 00:00:00 2001
From: Amit Karsale <amit.karsale@perforce.com>
Date: Wed, 8 May 2024 19:57:48 +0530
Subject: [PATCH] (PA-6263) Add AL2 for 7.x project in pxp-agent-vanagon

---
 configs/components/cpp-hocon.rb       | 6 +++++-
 configs/components/cpp-pcp-client.rb  | 6 +++++-
 configs/components/leatherman.rb      | 6 +++++-
 configs/components/pxp-agent.rb       | 6 +++++-
 configs/platforms/amazon-7-aarch64.rb | 3 +++
 5 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 configs/platforms/amazon-7-aarch64.rb

diff --git a/configs/components/cpp-hocon.rb b/configs/components/cpp-hocon.rb
index f0825af..18e3ea0 100644
--- a/configs/components/cpp-hocon.rb
+++ b/configs/components/cpp-hocon.rb
@@ -46,10 +46,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 0c69992..a719dcb 100644
--- a/configs/components/cpp-pcp-client.rb
+++ b/configs/components/cpp-pcp-client.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 = ''
     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 e1acc73..8c33c19 100644
--- a/configs/components/leatherman.rb
+++ b/configs/components/leatherman.rb
@@ -86,9 +86,13 @@
     # 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 = ''
+    cmake = if platform.name =~ /amazon-7-aarch64/
+              '/usr/bin/cmake3'
+            else
+              'cmake'
+            end
 
     # 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' "
diff --git a/configs/components/pxp-agent.rb b/configs/components/pxp-agent.rb
index abc5c32..f6dc9db 100644
--- a/configs/components/pxp-agent.rb
+++ b/configs/components/pxp-agent.rb
@@ -70,10 +70,14 @@
     # use default that is pl-build-tools
   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
diff --git a/configs/platforms/amazon-7-aarch64.rb b/configs/platforms/amazon-7-aarch64.rb
new file mode 100644
index 0000000..4aafe85
--- /dev/null
+++ b/configs/platforms/amazon-7-aarch64.rb
@@ -0,0 +1,3 @@
+platform "amazon-7-aarch64" do |plat|
+  plat.inherit_from_default
+end