From fb908b9fde6e6870249f20a80ea9fb8d1e4e4bf0 Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Wed, 24 Apr 2024 12:30:34 -0500 Subject: [PATCH] (PA-6383) build augeas and libedit with shared compiler settings --- configs/components/augeas.rb | 10 +++++++++- configs/components/libedit.rb | 5 ++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/configs/components/augeas.rb b/configs/components/augeas.rb index 72cffa9bc..1a40a8175 100644 --- a/configs/components/augeas.rb +++ b/configs/components/augeas.rb @@ -125,7 +125,15 @@ end end - if platform.name =~ /sles-15|el-8|debian-10/ || platform.is_fedora? + # conditional taken from projects/_shared-compiler-settings + # TODO: refactor condition + if ((platform.is_sles? && platform.os_version.to_i >= 15) || + (platform.is_el? && platform.os_version.to_i >= 8) || + platform.is_debian? || + (platform.is_ubuntu? && platform.os_version.to_i >= 20) || + (platform.is_amazon? && platform.os_version.to_i >= 2023) || + platform.is_fedora? + ) pkg.environment 'CFLAGS', settings[:cflags] pkg.environment 'CPPFLAGS', settings[:cppflags] pkg.environment "LDFLAGS", settings[:ldflags] diff --git a/configs/components/libedit.rb b/configs/components/libedit.rb index 61f47c764..1bf04591c 100644 --- a/configs/components/libedit.rb +++ b/configs/components/libedit.rb @@ -11,9 +11,8 @@ elsif platform.is_aix? pkg.environment "CC", "/opt/pl-build-tools/bin/gcc" pkg.environment "LDFLAGS", settings[:ldflags] - end - - if platform.is_macos? + else + pkg.environment "LDFLAGS", settings[:ldflags] pkg.environment "CFLAGS", settings[:cflags] end