diff options
| author | Misty De Meo | 2014-03-20 20:56:49 -0700 |
|---|---|---|
| committer | Misty De Meo | 2014-03-20 20:56:49 -0700 |
| commit | d7c188ef6fc3a6ded15c06f15ee4d4a512aaa046 (patch) | |
| tree | e43606836218eaea532fb683d651d2a23032c489 /Library | |
| parent | be573e9b106d6fc800c6b71cf1bf96c5eb1466b1 (diff) | |
| download | homebrew-d7c188ef6fc3a6ded15c06f15ee4d4a512aaa046.tar.bz2 | |
ruby: remove upstreamed patch
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/ruby.rb | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/Library/Formula/ruby.rb b/Library/Formula/ruby.rb index 355156f6d..6e2a1b406 100644 --- a/Library/Formula/ruby.rb +++ b/Library/Formula/ruby.rb @@ -28,10 +28,6 @@ class Ruby < Formula build 2326 end - # pthread_setname_np() is unavailable before Snow Leopard - # Reported upstream: https://bugs.ruby-lang.org/issues/9492 - patch :DATA if MacOS.version < :snow_leopard - def install system "autoconf" if build.head? @@ -85,36 +81,3 @@ class Ruby < Formula assert_equal 0, $?.exitstatus end end - -__END__ -diff --git a/thread_pthread.c b/thread_pthread.c -index 3911f8f..74d1ab7 100644 ---- a/thread_pthread.c -+++ b/thread_pthread.c -@@ -1416,15 +1416,6 @@ timer_thread_sleep(rb_global_vm_lock_t* unused) - } - #endif /* USE_SLEEPY_TIMER_THREAD */ - --#if defined(__linux__) && defined(PR_SET_NAME) --# define SET_THREAD_NAME(name) prctl(PR_SET_NAME, name) --#elif defined(__APPLE__) --/* pthread_setname_np() on Darwin does not have target thread argument */ --# define SET_THREAD_NAME(name) pthread_setname_np(name) --#else --# define SET_THREAD_NAME(name) (void)0 --#endif -- - static void * - thread_timer(void *p) - { -@@ -1432,7 +1423,9 @@ thread_timer(void *p) - - if (TT_DEBUG) WRITE_CONST(2, "start timer thread\n"); - -- SET_THREAD_NAME("ruby-timer-thr"); -+#if defined(__linux__) && defined(PR_SET_NAME) -+ prctl(PR_SET_NAME, "ruby-timer-thr"); -+#endif - - #if !USE_SLEEPY_TIMER_THREAD - native_mutex_initialize(&timer_thread_lock); |
