Skip to content

Commit

Permalink
(PA-5640) Fix up ffi gem
Browse files Browse the repository at this point in the history
This PR sets the PKG_CONFIG_PATH for the rubygem-ffi component.
  • Loading branch information
cthorn42 committed Jul 18, 2023
1 parent 5172806 commit b71a762
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions configs/components/rubygem-ffi.rb
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,14 @@
end
end

if platform.name =~ /solaris-11-i386/
# With Ruby 3.2 on Solaris-11 we install OpenSCW's libffi, no need to copy over the system libffi
if platform.name =~ /solaris-11-i386/ && rb_major_minor_version < 3.2
pkg.install_file "/usr/lib/libffi.so.5.0.10", "#{settings[:libdir]}/libffi.so"
elsif platform.name =~ /solaris-10-i386/
pkg.install_file "/opt/csw/lib/libffi.so.6", "#{settings[:libdir]}/libffi.so.6"
end


pkg.environment "PKG_CONFIG_PATH", '/opt/puppetlabs/puppet/lib/pkgconfig:$(PKG_CONFIG_PATH)'
pkg.environment 'PATH', '/opt/freeware/bin:/opt/pl-build-tools/bin:$(PATH)' if platform.is_aix?

if platform.is_cross_compiled? && !platform.is_macos?
Expand Down

0 comments on commit b71a762

Please sign in to comment.