From 811a384b23b06341a1a9ecbdff80108545b597c2 Mon Sep 17 00:00:00 2001 From: david22swan Date: Mon, 13 Nov 2023 18:09:01 +0000 Subject: [PATCH] (CAT-1505) Remove unneeded lines from Ruby 3.2 setup Explicit components have been added for both `libffi` and `libyaml` so these lines are no longer needed when setting up Ruby 3.2 and above and so can be removed. --- configs/components/runtime-pdk.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/configs/components/runtime-pdk.rb b/configs/components/runtime-pdk.rb index 2cc2b7bd4..92645efaf 100644 --- a/configs/components/runtime-pdk.rb +++ b/configs/components/runtime-pdk.rb @@ -1,7 +1,5 @@ # This component exists to link in the gcc and stdc++ runtime libraries. component "runtime-pdk" do |pkg, settings, platform| - pkg.build_requires "libffi" - pkg.build_requires "libyaml" if platform.is_windows? lib_type = platform.architecture == "x64" ? "seh" : "sjlj" @@ -21,11 +19,6 @@ pkg.install_file "#{settings[:tools_root]}/bin/libiconv-2.dll", "#{settings[:ruby_bindir]}/libiconv-2.dll" pkg.install_file "#{settings[:tools_root]}/bin/libffi-6.dll", "#{settings[:ruby_bindir]}/libffi-6.dll" - if settings[:ruby_major_version] >= 3 - pkg.install_file "#{settings[:bindir]}/libyaml-0-2.dll", "#{settings[:ruby_bindir]}/libyaml-0-2.dll" - pkg.install_file "#{settings[:bindir]}/libffi-8.dll", "#{settings[:ruby_bindir]}/libffi-8.dll" - end - # Copy the DLLs into additional ruby install bindirs as well. if settings.has_key?(:additional_rubies) settings[:additional_rubies].each do |rubyver, local_settings|