Skip to content

Commit 416c600

Browse files
committed
(PA-6422) Use platform=ruby to remove nokogiri workaround for macOS 12 ARM
Now that we're patching homebrew's ruby 3.2.4 correctly, we can remove our workaround and use platform=ruby as suggested in https://nokogiri.org/tutorials/installing_nokogiri.html#installing-using-standard-system-libraries Note --platform is an option to `gem install` so it comes before double dashes.
1 parent 2954847 commit 416c600

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

configs/components/rubygem-nokogiri.rb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
component 'rubygem-nokogiri' do |pkg, _settings, _platform|
22
pkg.version '1.14.2'
33
pkg.sha256sum 'c765a74aac6cf430a710bb0b6038b8ee11f177393cd6ae8dadc7a44a6e2658b6'
4-
# On macOS when we are not cross compiling we need to use runtime's libxml2 and libxslt
5-
if platform.is_macos? && !platform.is_cross_compiled?
6-
settings[:gem_install_options] = "-- --use-system-libraries \
4+
5+
settings[:gem_install_options] = "--platform=ruby -- \
6+
--use-system-libraries \
77
--with-xml2-lib=#{settings[:libdir]} \
88
--with-xml2-include=#{settings[:includedir]}/libxml2 \
99
--with-xslt-lib=#{settings[:libdir]} \
1010
--with-xslt-include=#{settings[:includedir]}"
11-
end
1211
instance_eval File.read('configs/components/_base-rubygem.rb')
1312
pkg.build_requires 'rubygem-mini_portile2'
1413
gem_home = settings[:gem_home]

0 commit comments

Comments
 (0)