From b0134120b0607811b44e0b27163d77ed16939ade Mon Sep 17 00:00:00 2001 From: Marcus Poller Date: Wed, 11 Feb 2026 17:00:52 +0100 Subject: [PATCH 1/3] rpm uses system-openssl. simplify --- configs/components/ruby-augeas.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/components/ruby-augeas.rb b/configs/components/ruby-augeas.rb index 718e40e9..be1ede41 100644 --- a/configs/components/ruby-augeas.rb +++ b/configs/components/ruby-augeas.rb @@ -12,6 +12,8 @@ pkg.environment 'PATH', '$(PATH):/usr/local/bin:/opt/csw/bin:/usr/ccs/bin:/usr/sfw/bin' pkg.environment 'CONFIGURE_ARGS', '--vendor' pkg.environment 'PKG_CONFIG_PATH', "#{File.join(settings[:libdir], 'pkgconfig')}:/usr/lib/pkgconfig" + pkg.environment 'LD_LIBRARY_PATH', "" + pkg.environment 'LD_RUN_PATH', "/opt/puppetlabs/puppet/lib" if platform.is_aix? pkg.environment 'CC', '/opt/freeware/bin/gcc' @@ -55,7 +57,7 @@ # so bypass the shim and use pkgconf directly. extconf += ' --with-pkg-config=/usr/bin/pkgconf' if platform.name =~ /(el|redhatfips)-(9|10)/ build_commands << extconf - build_commands << "#{platform[:make]} -e -j$(shell expr $(shell #{platform[:num_cores]}) + 1)" + build_commands << "#{platform[:make]} -e -j#{platform[:num_cores] + 1}" build_commands end From 4ee2db622a3ffebd7d0f54cfd85303d51c469915 Mon Sep 17 00:00:00 2001 From: Marcus Poller Date: Wed, 11 Feb 2026 17:07:30 +0100 Subject: [PATCH 2/3] type typo --- configs/components/ruby-augeas.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/components/ruby-augeas.rb b/configs/components/ruby-augeas.rb index be1ede41..a8829646 100644 --- a/configs/components/ruby-augeas.rb +++ b/configs/components/ruby-augeas.rb @@ -57,7 +57,7 @@ # so bypass the shim and use pkgconf directly. extconf += ' --with-pkg-config=/usr/bin/pkgconf' if platform.name =~ /(el|redhatfips)-(9|10)/ build_commands << extconf - build_commands << "#{platform[:make]} -e -j#{platform[:num_cores] + 1}" + build_commands << "#{platform[:make]} -e -j#{platform[:num_cores].to_i + 1}" build_commands end From ce7bcf877b5106a48fc80c0cced48115d80eab16 Mon Sep 17 00:00:00 2001 From: Marcus Poller Date: Wed, 11 Feb 2026 20:32:31 +0100 Subject: [PATCH 3/3] trying makes you wiser --- configs/components/augeas.rb | 3 +++ configs/components/ruby-augeas.rb | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configs/components/augeas.rb b/configs/components/augeas.rb index a5a59645..531a0d9e 100644 --- a/configs/components/augeas.rb +++ b/configs/components/augeas.rb @@ -40,6 +40,9 @@ # Ensure we're building against our own libraries when present pkg.environment 'PKG_CONFIG_PATH', "#{settings[:libdir]}/pkgconfig" + pkg.environment 'LD_LIBRARY_PATH', "" +# pkg.environment 'LD_RUN_PATH', "/opt/puppetlabs/puppet/lib" + pkg.environment 'LD_RUN_PATH', "" if platform.is_aix? pkg.environment 'CC', '/opt/freeware/bin/gcc' diff --git a/configs/components/ruby-augeas.rb b/configs/components/ruby-augeas.rb index a8829646..0949bfc8 100644 --- a/configs/components/ruby-augeas.rb +++ b/configs/components/ruby-augeas.rb @@ -13,7 +13,8 @@ pkg.environment 'CONFIGURE_ARGS', '--vendor' pkg.environment 'PKG_CONFIG_PATH', "#{File.join(settings[:libdir], 'pkgconfig')}:/usr/lib/pkgconfig" pkg.environment 'LD_LIBRARY_PATH', "" - pkg.environment 'LD_RUN_PATH', "/opt/puppetlabs/puppet/lib" +# pkg.environment 'LD_RUN_PATH', "/opt/puppetlabs/puppet/lib" + pkg.environment 'LD_RUN_PATH', "" if platform.is_aix? pkg.environment 'CC', '/opt/freeware/bin/gcc'