mykola/freebsd-ports
1
0
Fork 0
forked from Lainports/freebsd-ports
Code Pull requests Activity

sysutils/puppet6: Fix build with rubygem-concurrent-ruby 1.2.0+

Browse source 
- 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:	https://github.com/ruby-concurrency/concurrent-ruby/pull/988
		https://github.com/ruby-concurrency/concurrent-ruby/issues/986
		9182bc3dd2
This commit is contained in:
Po-Chuan Hsieh 2023-02-05 23:29:45 +08:00
parent e177d5bb97
commit 347b5b85e2
No known key found for this signature in database
GPG key ID: 9A4BD10F002DD04B
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysutils/puppet6/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= puppet
PORTVERSION= 6.28.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= https://forge.puppet.com/v3/files/:forge
PKGNAMESUFFIX= 6

13
sysutils/puppet6/files/patch-lib_puppet_thread__local.rb Normal file
View file

@ -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-07-11 22:46:41 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