Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(PA-6263) Add amazon linux2 to pxp-agent 7.x and bump cmake #119

Merged
merged 1 commit into from
May 8, 2024
Merged

(PA-6263) Add amazon linux2 to pxp-agent 7.x and bump cmake #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion configs/components/cpp-hocon.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 5 additions & 1 deletion configs/components/cpp-pcp-client.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion configs/components/leatherman.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' "
Expand Down
6 changes: 5 additions & 1 deletion configs/components/pxp-agent.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions configs/platforms/amazon-7-aarch64.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
platform "amazon-7-aarch64" do |plat|
plat.inherit_from_default
end