File tree 2 files changed +3
-3
lines changed
2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change 11
11
pkg . build_requires "libxml2"
12
12
13
13
# 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"
15
15
16
16
if platform . is_aix?
17
17
pkg . build_requires "http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/pkg-config-0.19-6.aix5.2.ppc.rpm"
Original file line number Diff line number Diff line change 13
13
if platform . is_aix?
14
14
pkg . build_requires "http://osmirror.delivery.puppetlabs.net/AIX_MIRROR/pkg-config-0.19-6.aix5.2.ppc.rpm"
15
15
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"
17
17
pkg . environment "LDFLAGS" , " -brtl #{ settings [ :ldflags ] } "
18
18
end
19
19
30
30
ruby = "#{ settings [ :host_ruby ] } -r#{ settings [ :datadir ] } /doc/rbconfig.rb"
31
31
pkg . environment "LDFLAGS" , settings [ :ldflags ]
32
32
else
33
- ruby = File . join ( settings [ :bindir ] , 'ruby' )
33
+ ruby = File . join ( settings [ :ruby_bindir ] , 'ruby' )
34
34
end
35
35
36
36
# This is a disturbing workaround needed for s390x based systems, that
You can’t perform that action at this time.
0 commit comments