-
Notifications
You must be signed in to change notification settings - Fork 745
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sysutils/puppet7: Fix build with rubygem-concurrent-ruby 1.2.0+
- Bump PORTREVISION for package change Use ThreadLocalVar instead of RubyThreadLocalVar which was removed in 1.2.0. RubyThreadLocalVar is a private class and an implementation detail. Reference: ruby-concurrency/concurrent-ruby#988 ruby-concurrency/concurrent-ruby#986 puppetlabs/puppet@9182bc3
- Loading branch information
Showing
2 changed files
with
14 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
Reference: https://github.com/ruby-concurrency/concurrent-ruby/pull/988 | ||
https://github.com/ruby-concurrency/concurrent-ruby/issues/986 | ||
https://github.com/puppetlabs/puppet/commit/9182bc3dd2576f409a6d01fb5c08d392670e90a2 | ||
|
||
--- lib/puppet/thread_local.rb.orig 2022-12-02 03:58:03 UTC | ||
+++ lib/puppet/thread_local.rb | ||
@@ -3,5 +3,5 @@ require 'concurrent' | ||
# We want to use the pure Ruby implementation even on JRuby. If we use the Java | ||
# implementation of ThreadLocal, we end up leaking references to JRuby instances | ||
# and preventing them from being garbage collected. | ||
-class Puppet::ThreadLocal < Concurrent::RubyThreadLocalVar | ||
+class Puppet::ThreadLocal < Concurrent::ThreadLocalVar | ||
end |