diff options
Diffstat (limited to 'lang/ruby22')
| -rw-r--r-- | lang/ruby22/Makefile | 5 | ||||
| -rw-r--r-- | lang/ruby22/files/patch-eval.c | 8 | ||||
| -rw-r--r-- | lang/ruby22/files/patch-eval_error.c | 6 | ||||
| -rw-r--r-- | lang/ruby22/files/patch-ext_readline_extconf.rb | 6 | ||||
| -rw-r--r-- | lang/ruby22/files/patch-thread.c | 4 | ||||
| -rw-r--r-- | lang/ruby22/files/patch-vm_eval.c | 4 | ||||
| -rw-r--r-- | lang/ruby22/files/patch-vm_trace.c | 4 |
7 files changed, 18 insertions, 19 deletions
diff --git a/lang/ruby22/Makefile b/lang/ruby22/Makefile index 9329dadc3923..2bf55d212fc4 100644 --- a/lang/ruby22/Makefile +++ b/lang/ruby22/Makefile @@ -11,15 +11,13 @@ DISTNAME= ${RUBY_DISTNAME} DIST_SUBDIR= ruby MAINTAINER= ruby@FreeBSD.org -COMMENT?= Object-oriented interpreted scripting language +COMMENT= Object-oriented interpreted scripting language LICENSE= BSD2CLAUSE RUBY LICENSE_COMB= dual LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL LICENSE_FILE_RUBY= ${WRKSRC}/COPYING -MAKE_JOBS_UNSAFE= yes - # Using LIB_DEPENDS finds the libffi from gcc which causes problems BUILD_DEPENDS= libffi>=0:devel/libffi LIB_DEPENDS= libyaml.so:textproc/libyaml @@ -37,6 +35,7 @@ CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes # Keep this, else ruby will fail to load libraries dependent of libpthread. LIBS+= -lpthread -L${LOCALBASE}/lib +MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes USES= autoreconf cpe execinfo tar:xz ssl WRKSRC= ${RUBY_WRKSRC} diff --git a/lang/ruby22/files/patch-eval.c b/lang/ruby22/files/patch-eval.c index c9e410810785..503b0342fd60 100644 --- a/lang/ruby22/files/patch-eval.c +++ b/lang/ruby22/files/patch-eval.c @@ -1,6 +1,6 @@ ---- eval.c.orig 2014-12-09 02:16:27.000000000 +0100 -+++ eval.c 2016-01-10 19:10:59.326340000 +0100 -@@ -797,7 +797,7 @@ rb_rescue2(VALUE (* b_proc) (ANYARGS), V +--- eval.c.orig 2016-11-14 18:37:39 UTC ++++ eval.c +@@ -814,7 +814,7 @@ rb_rescue2(VALUE (* b_proc) (ANYARGS), V { int state; rb_thread_t *th = GET_THREAD(); @@ -9,7 +9,7 @@ volatile VALUE result = Qfalse; volatile VALUE e_info = th->errinfo; va_list args; -@@ -863,7 +863,7 @@ rb_protect(VALUE (* proc) (VALUE), VALUE +@@ -880,7 +880,7 @@ rb_protect(VALUE (* proc) (VALUE), VALUE volatile VALUE result = Qnil; volatile int status; rb_thread_t *th = GET_THREAD(); diff --git a/lang/ruby22/files/patch-eval_error.c b/lang/ruby22/files/patch-eval_error.c index 400ef4a4448d..45fac683a31c 100644 --- a/lang/ruby22/files/patch-eval_error.c +++ b/lang/ruby22/files/patch-eval_error.c @@ -1,6 +1,6 @@ ---- eval_error.c.orig 2015-01-17 08:47:29.000000000 +0100 -+++ eval_error.c 2016-01-10 19:11:10.416384000 +0100 -@@ -80,9 +80,9 @@ static void +--- eval_error.c.orig 2016-11-14 18:37:39 UTC ++++ eval_error.c +@@ -63,9 +63,9 @@ static void error_print(void) { volatile VALUE errat = Qundef; diff --git a/lang/ruby22/files/patch-ext_readline_extconf.rb b/lang/ruby22/files/patch-ext_readline_extconf.rb index daa6055cea28..73d992fadae7 100644 --- a/lang/ruby22/files/patch-ext_readline_extconf.rb +++ b/lang/ruby22/files/patch-ext_readline_extconf.rb @@ -1,6 +1,6 @@ ---- ext/readline/extconf.rb.orig 2014-05-01 11:59:37.000000000 +0000 -+++ ext/readline/extconf.rb 2015-10-23 04:05:44.000000000 +0000 -@@ -62,7 +63,7 @@ else +--- ext/readline/extconf.rb.orig 2015-12-01 18:28:54 UTC ++++ ext/readline/extconf.rb +@@ -63,7 +63,7 @@ else end readline.have_func("rl_getc") diff --git a/lang/ruby22/files/patch-thread.c b/lang/ruby22/files/patch-thread.c index 992da4cd8608..dede6c31d506 100644 --- a/lang/ruby22/files/patch-thread.c +++ b/lang/ruby22/files/patch-thread.c @@ -1,5 +1,5 @@ ---- thread.c.orig 2015-02-20 14:53:23.000000000 +0100 -+++ thread.c 2016-01-10 19:11:32.423524000 +0100 +--- thread.c.orig 2016-11-11 22:33:21 UTC ++++ thread.c @@ -462,8 +462,8 @@ rb_threadptr_unlock_all_locking_mutexes( void rb_thread_terminate_all(void) diff --git a/lang/ruby22/files/patch-vm_eval.c b/lang/ruby22/files/patch-vm_eval.c index 350be9dc9325..ee253c9a2609 100644 --- a/lang/ruby22/files/patch-vm_eval.c +++ b/lang/ruby22/files/patch-vm_eval.c @@ -1,5 +1,5 @@ ---- vm_eval.c.orig 2015-11-29 10:01:12.000000000 +0100 -+++ vm_eval.c 2016-01-10 19:11:40.066355000 +0100 +--- vm_eval.c.orig 2016-03-28 17:04:28 UTC ++++ vm_eval.c @@ -1111,7 +1111,7 @@ rb_iterate(VALUE (* it_proc) (VALUE), VA int state; volatile VALUE retval = Qnil; diff --git a/lang/ruby22/files/patch-vm_trace.c b/lang/ruby22/files/patch-vm_trace.c index c049d414e9f8..bb302fc68334 100644 --- a/lang/ruby22/files/patch-vm_trace.c +++ b/lang/ruby22/files/patch-vm_trace.c @@ -1,5 +1,5 @@ ---- vm_trace.c.orig 2015-11-08 15:49:09.000000000 +0100 -+++ vm_trace.c 2016-01-10 19:11:46.862754000 +0100 +--- vm_trace.c.orig 2015-11-08 14:49:09 UTC ++++ vm_trace.c @@ -390,7 +390,7 @@ rb_suppress_tracing(VALUE (*func)(VALUE) volatile int raised; volatile int outer_state; |