diff options
| author | Stanislav Sedov <stas@FreeBSD.org> | 2010-04-27 22:14:06 +0000 |
|---|---|---|
| committer | Stanislav Sedov <stas@FreeBSD.org> | 2010-04-27 22:14:06 +0000 |
| commit | 561017fe760806a3f541f572776b9abaf29dfd97 (patch) | |
| tree | e13283a0e66c798077de022adf4ab7cd6ed52617 /lang | |
| parent | 805405e3964a2085115a4bf50e79a34c71503d3b (diff) | |
| download | ports-561017fe760806a3f541f572776b9abaf29dfd97.tar.gz ports-561017fe760806a3f541f572776b9abaf29dfd97.zip | |
Notes
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ruby18/files/patch-eval.c | 24 | ||||
| -rw-r--r-- | lang/ruby18/files/patch-intern.h | 10 | ||||
| -rw-r--r-- | lang/ruby18/files/patch-process.c | 11 |
3 files changed, 45 insertions, 0 deletions
diff --git a/lang/ruby18/files/patch-eval.c b/lang/ruby18/files/patch-eval.c new file mode 100644 index 000000000000..0c32f5b5996c --- /dev/null +++ b/lang/ruby18/files/patch-eval.c @@ -0,0 +1,24 @@ +--- eval.c.orig 2010-04-27 01:09:22.000000000 -0700 ++++ eval.c 2010-04-27 01:11:14.000000000 -0700 +@@ -12343,7 +12343,7 @@ + safe_mutex_lock(&time_thread.lock); + if (pthread_create(&time_thread.thread, 0, thread_timer, args) == 0) { + thread_init = 1; +- pthread_atfork(0, 0, rb_thread_stop_timer); ++ pthread_atfork(0, 0, rb_thread_stop_timer_fake); + pthread_cond_wait(&start, &time_thread.lock); + } + pthread_cleanup_pop(1); +@@ -12359,6 +12359,12 @@ + pthread_cleanup_pop(1); + pthread_join(time_thread.thread, NULL); + } ++ ++void ++rb_thread_stop_timer_fake() ++{ ++ thread_init = 0; ++} + #elif defined(HAVE_SETITIMER) + static void + catch_timer(sig) diff --git a/lang/ruby18/files/patch-intern.h b/lang/ruby18/files/patch-intern.h new file mode 100644 index 000000000000..bdd25e8ebc65 --- /dev/null +++ b/lang/ruby18/files/patch-intern.h @@ -0,0 +1,10 @@ +--- intern.h.orig 2010-04-27 01:11:20.000000000 -0700 ++++ intern.h 2010-04-27 01:11:30.000000000 -0700 +@@ -209,6 +209,7 @@ + void rb_gc_mark_threads _((void)); + void rb_thread_start_timer _((void)); + void rb_thread_stop_timer _((void)); ++void rb_thread_stop_timer_fake _((void)); + void rb_thread_schedule _((void)); + void rb_thread_wait_fd _((int)); + int rb_thread_fd_writable _((int)); diff --git a/lang/ruby18/files/patch-process.c b/lang/ruby18/files/patch-process.c new file mode 100644 index 000000000000..6b8f08bae09c --- /dev/null +++ b/lang/ruby18/files/patch-process.c @@ -0,0 +1,11 @@ +--- process.c.orig 2010-04-27 01:11:32.000000000 -0700 ++++ process.c 2010-04-27 01:11:39.000000000 -0700 +@@ -920,7 +920,7 @@ + #endif + + #ifdef HAVE_SETITIMER +-#define before_exec() rb_thread_stop_timer() ++#define before_exec() rb_thread_stop_timer_fake() + #define after_exec() rb_thread_start_timer() + #else + #define before_exec() |