Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions configs/components/augeas.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 4 additions & 1 deletion configs/components/ruby-augeas.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down
Loading