From 5889251bd132cd1d41857631665b7c3ea4c6cf17 Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Wed, 8 May 2024 09:22:01 -0700 Subject: [PATCH] (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. --- configs/components/rubygem-nokogiri.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configs/components/rubygem-nokogiri.rb b/configs/components/rubygem-nokogiri.rb index ae64f0906..eca304201 100644 --- a/configs/components/rubygem-nokogiri.rb +++ b/configs/components/rubygem-nokogiri.rb @@ -1,14 +1,13 @@ component 'rubygem-nokogiri' do |pkg, _settings, _platform| pkg.version '1.14.2' pkg.sha256sum 'c765a74aac6cf430a710bb0b6038b8ee11f177393cd6ae8dadc7a44a6e2658b6' - # On macOS when we are not cross compiling we need to use runtime's libxml2 and libxslt - if platform.is_macos? && !platform.is_cross_compiled? - settings[:gem_install_options] = "-- --use-system-libraries \ + + settings[:gem_install_options] = "--platform=ruby -- \ + --use-system-libraries \ --with-xml2-lib=#{settings[:libdir]} \ --with-xml2-include=#{settings[:includedir]}/libxml2 \ --with-xslt-lib=#{settings[:libdir]} \ --with-xslt-include=#{settings[:includedir]}" - end instance_eval File.read('configs/components/_base-rubygem.rb') pkg.build_requires 'rubygem-mini_portile2' gem_home = settings[:gem_home]