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 718e40e9..0949bfc8 100644 --- a/configs/components/ruby-augeas.rb +++ b/configs/components/ruby-augeas.rb @@ -12,6 +12,9 @@ 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" + pkg.environment 'LD_RUN_PATH', "" if platform.is_aix? pkg.environment 'CC', '/opt/freeware/bin/gcc' @@ -55,7 +58,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].to_i + 1}" build_commands end