diff options
author | jperkin <jperkin@pkgsrc.org> | 2022-05-05 10:25:05 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2022-05-05 10:25:05 +0000 |
commit | e5bacd985762b2bacf73a2908e29749fe8358711 (patch) | |
tree | 204c2faf7d5620984d87b9f8e4375b08d924633c /lang | |
parent | 4c0d2b4adaefa082216fe5798a2136a3d1b8b104 (diff) | |
download | pkgsrc-e5bacd985762b2bacf73a2908e29749fe8358711.tar.gz |
ruby31-base: Fix install on macOS arm64.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/ruby31-base/distinfo | 3 | ||||
-rw-r--r-- | lang/ruby31-base/patches/patch-tool_runruby.rb | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/lang/ruby31-base/distinfo b/lang/ruby31-base/distinfo index c7160d3c5e3..be3b99b8151 100644 --- a/lang/ruby31-base/distinfo +++ b/lang/ruby31-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2022/05/04 16:44:53 taca Exp $ +$NetBSD: distinfo,v 1.6 2022/05/05 10:25:05 jperkin Exp $ BLAKE2s (ruby-3.1.2.tar.xz) = 5384cfebbd466de36f68f554be2c045363e6c074d90a94a4c035ecaadf3c878b SHA512 (ruby-3.1.2.tar.xz) = 4a74e9efc6ea4b3eff4fec7534eb1fff4794d021531defc2e9937e53c6668db8ecdc0fff2bc23d5e6602d0df344a2caa85b31c5414309541e3d5313ec82b6e21 @@ -19,3 +19,4 @@ SHA1 (patch-lib_rubygems_platform.rb) = 7ef0d86c2d84b942db726d293a319d7ea54e56c8 SHA1 (patch-test_rubygems_test__gem.rb) = e624da5b9c49f9409160a7b0fdd2efad17986cab SHA1 (patch-thread__pthread.c) = 7c1231933a2d6ce9d56891ab512371841697fbca SHA1 (patch-tool_ifchange) = 1814cd41f0b0a93b181799cb117bd1f57068cf33 +SHA1 (patch-tool_runruby.rb) = 5dd8a3bea5e9776f7521f85955dddd2127e4c4d0 diff --git a/lang/ruby31-base/patches/patch-tool_runruby.rb b/lang/ruby31-base/patches/patch-tool_runruby.rb new file mode 100644 index 00000000000..31d4d3e414d --- /dev/null +++ b/lang/ruby31-base/patches/patch-tool_runruby.rb @@ -0,0 +1,15 @@ +$NetBSD: patch-tool_runruby.rb,v 1.1 2022/05/05 10:25:05 jperkin Exp $ + +Do not LD_PRELOAD on macOS, breaks chroots. + +--- tool/runruby.rb.orig 2022-04-12 11:11:15.000000000 +0000 ++++ tool/runruby.rb +@@ -132,7 +132,7 @@ if File.file?(libruby_so) + e = nil if e.empty? + e ||= "LD_PRELOAD" if /linux/ =~ RUBY_PLATFORM + end +- if e ++ unless /darwin/ =~ RUBY_PLATFORM + env[e] = [libruby_so, ENV[e]].compact.join(File::PATH_SEPARATOR) + end + end |