Skip to content

Commit 91d854c

Browse files
committed
(PDK-576) fix up some hardcoded paths in augeas components
These paths only work on the agent, but not on the PDK. Adjusted to match the definitions required.
1 parent 455f0de commit 91d854c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

configs/components/augeas.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
pkg.build_requires "libxml2"
1212

1313
# Ensure we're building against our own libraries when present
14-
pkg.environment "PKG_CONFIG_PATH", "/opt/puppetlabs/puppet/lib/pkgconfig"
14+
pkg.environment "PKG_CONFIG_PATH", "#{settings[:libdir]}/pkgconfig"
1515

1616
if platform.is_aix?
1717
pkg.build_requires "http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/pkg-config-0.19-6.aix5.2.ppc.rpm"

configs/components/ruby-augeas.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
if platform.is_aix?
1414
pkg.build_requires "http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/pkg-config-0.19-6.aix5.2.ppc.rpm"
1515
pkg.environment "CC", "/opt/pl-build-tools/bin/gcc"
16-
pkg.environment "RUBY", "/opt/puppetlabs/puppet/bin/ruby"
16+
pkg.environment "RUBY", "#{settings[:ruby_bindir]}/ruby"
1717
pkg.environment "LDFLAGS", " -brtl #{settings[:ldflags]}"
1818
end
1919

@@ -30,7 +30,7 @@
3030
ruby = "#{settings[:host_ruby]} -r#{settings[:datadir]}/doc/rbconfig.rb"
3131
pkg.environment "LDFLAGS", settings[:ldflags]
3232
else
33-
ruby = File.join(settings[:bindir], 'ruby')
33+
ruby = File.join(settings[:ruby_bindir], 'ruby')
3434
end
3535

3636
# This is a disturbing workaround needed for s390x based systems, that

0 commit comments

Comments
 (0)