summaryrefslogtreecommitdiff
path: root/lang/ruby22-base
diff options
context:
space:
mode:
Diffstat (limited to 'lang/ruby22-base')
-rw-r--r--lang/ruby22-base/distinfo15
-rw-r--r--lang/ruby22-base/hacks.mk8
-rw-r--r--lang/ruby22-base/patches/patch-eval.c22
-rw-r--r--lang/ruby22-base/patches/patch-eval__error.c17
-rw-r--r--lang/ruby22-base/patches/patch-thread.c15
-rw-r--r--lang/ruby22-base/patches/patch-vm__eval.c33
-rw-r--r--lang/ruby22-base/patches/patch-vm__trace.c13
7 files changed, 9 insertions, 114 deletions
diff --git a/lang/ruby22-base/distinfo b/lang/ruby22-base/distinfo
index 2fe4805239c..124d5cb3159 100644
--- a/lang/ruby22-base/distinfo
+++ b/lang/ruby22-base/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.16 2016/12/05 15:02:25 taca Exp $
+$NetBSD: distinfo,v 1.17 2017/04/09 15:49:50 taca Exp $
-SHA1 (ruby-2.2.6.tar.bz2) = 67b15fcc394bb1ffb5a7e926dcd6222d8e988188
-RMD160 (ruby-2.2.6.tar.bz2) = f157ece8e73ab9bbc49badb6a5fbb16815ac2af7
-SHA512 (ruby-2.2.6.tar.bz2) = 7a93f72d236521ac28c8a0bc0c73cf805797a8813d22e02f42c5fc05dd39f6e422817272e0db6a24c245f6f97ad4b2b412a9a47ac50156ab186df596918a5f34
-Size (ruby-2.2.6.tar.bz2) = 13378616 bytes
+SHA1 (ruby-2.2.7.tar.bz2) = 0b5b79f55a1e7a7c2f6600e75167c1b9cc435042
+RMD160 (ruby-2.2.7.tar.bz2) = 5aef4d373a0ea7434b7c32098b43ecc6fba542a6
+SHA512 (ruby-2.2.7.tar.bz2) = 83756cd1c91516962b83961e0de59d858618f7ed3e9795f930aab4f199d47a95ed8f867d8aa9b51d508be26d9babf2140117c88241168bac41e6ef702cfadf20
+Size (ruby-2.2.7.tar.bz2) = 13381078 bytes
SHA1 (patch-configure) = ad3d1862a48d12b793fd0062eb357372caa19abc
-SHA1 (patch-eval.c) = a1e86d4ed1729398393e83d519e991259c6163de
-SHA1 (patch-eval__error.c) = cc313587bb24e16e4702f784b30e64618ae3f5a4
SHA1 (patch-ext_dbm_extconf.rb) = ee932265052613d458375ad1a760a09fefb9d959
SHA1 (patch-ext_openssl_ossl__ssl.c) = e887a5576959921da116a5cee629c25610169593
SHA1 (patch-lib_mkmf.rb) = f86f1ae5a1053a0643545a2c11c9fd2bbd5a289d
@@ -25,7 +23,4 @@ SHA1 (patch-man_irb.1) = 2bf807b4c1b1c68d1f518caa054cfd900e0fedb7
SHA1 (patch-man_ri.1) = b07be05375977cfac0f88765a95e85db4f858885
SHA1 (patch-man_ruby.1) = 88ca6703fd58a89726618ca7dfc7912bad312b1c
SHA1 (patch-test_rubygems_test__gem.rb) = 01a36c32e49d518cc68bea5e76c7640451223b61
-SHA1 (patch-thread.c) = 93bba713014dfb92a59ba9715f50f23c5329de6a
SHA1 (patch-tool_rbinstall.rb) = 2bb27173a0e08de94391d56ef2b366a71ee2dc50
-SHA1 (patch-vm__eval.c) = b0739a5e64f99ce3adb86d7d676759cbc3aa7b1b
-SHA1 (patch-vm__trace.c) = 8e992c214b69c6237d4c4418aaba892079f9873e
diff --git a/lang/ruby22-base/hacks.mk b/lang/ruby22-base/hacks.mk
index 0a4143f5037..3cb7e4dfb89 100644
--- a/lang/ruby22-base/hacks.mk
+++ b/lang/ruby22-base/hacks.mk
@@ -1,7 +1,7 @@
-# $NetBSD: hacks.mk,v 1.1 2015/03/08 16:24:55 taca Exp $
+# $NetBSD: hacks.mk,v 1.2 2017/04/09 15:49:50 taca Exp $
-.if !defined(RUBY21_BASE_HACKS_MK)
-RUBY21_BASE_HACKS_MK= defined
+.if !defined(RUBY22_BASE_HACKS_MK)
+RUBY22_BASE_HACKS_MK= defined
.include "../../mk/compiler.mk"
@@ -34,4 +34,4 @@ PKG_HACKS+= optimisation
BUILDLINK_TRANSFORM+= opt:-Os:-O1 rm:-freorder-blocks
.endif
-.endif # RUBY21_BASE_HACKS_MK
+.endif # RUBY22_BASE_HACKS_MK
diff --git a/lang/ruby22-base/patches/patch-eval.c b/lang/ruby22-base/patches/patch-eval.c
deleted file mode 100644
index 4659f5d1d0a..00000000000
--- a/lang/ruby22-base/patches/patch-eval.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-eval.c,v 1.1 2015/11/20 14:31:59 joerg Exp $
-
---- eval.c.orig 2015-11-16 14:50:49.000000000 +0000
-+++ eval.c
-@@ -743,7 +743,7 @@ rb_rescue2(VALUE (* b_proc) (ANYARGS), V
- {
- int state;
- rb_thread_t *th = GET_THREAD();
-- rb_control_frame_t *cfp = th->cfp;
-+ rb_control_frame_t *volatile cfp = th->cfp;
- volatile VALUE result = Qfalse;
- volatile VALUE e_info = th->errinfo;
- va_list args;
-@@ -809,7 +809,7 @@ rb_protect(VALUE (* proc) (VALUE), VALUE
- volatile VALUE result = Qnil;
- volatile int status;
- rb_thread_t *th = GET_THREAD();
-- rb_control_frame_t *cfp = th->cfp;
-+ rb_control_frame_t * volatile cfp = th->cfp;
- struct rb_vm_protect_tag protect_tag;
- rb_jmpbuf_t org_jmpbuf;
-
diff --git a/lang/ruby22-base/patches/patch-eval__error.c b/lang/ruby22-base/patches/patch-eval__error.c
deleted file mode 100644
index e8b153ecd70..00000000000
--- a/lang/ruby22-base/patches/patch-eval__error.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-eval__error.c,v 1.1 2015/11/20 14:31:59 joerg Exp $
-
---- eval_error.c.orig 2015-11-16 15:02:19.000000000 +0000
-+++ eval_error.c
-@@ -80,9 +80,9 @@ static void
- error_print(void)
- {
- volatile VALUE errat = Qundef;
-- rb_thread_t *th = GET_THREAD();
-- VALUE errinfo = th->errinfo;
-- int raised_flag = th->raised_flag;
-+ rb_thread_t * volatile th = GET_THREAD();
-+ volatile VALUE errinfo = th->errinfo;
-+ volatile int raised_flag = th->raised_flag;
- volatile VALUE eclass = Qundef, e = Qundef;
- const char *volatile einfo;
- volatile long elen;
diff --git a/lang/ruby22-base/patches/patch-thread.c b/lang/ruby22-base/patches/patch-thread.c
deleted file mode 100644
index 8da76ea895d..00000000000
--- a/lang/ruby22-base/patches/patch-thread.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-thread.c,v 1.1 2015/11/20 14:31:59 joerg Exp $
-
---- thread.c.orig 2015-11-16 15:03:41.000000000 +0000
-+++ thread.c
-@@ -420,8 +420,8 @@ rb_threadptr_unlock_all_locking_mutexes(
- void
- rb_thread_terminate_all(void)
- {
-- rb_thread_t *th = GET_THREAD(); /* main thread */
-- rb_vm_t *vm = th->vm;
-+ rb_thread_t *volatile th = GET_THREAD(); /* main thread */
-+ rb_vm_t *volatile vm = th->vm;
-
- if (vm->main_thread != th) {
- rb_bug("rb_thread_terminate_all: called by child thread (%p, %p)",
diff --git a/lang/ruby22-base/patches/patch-vm__eval.c b/lang/ruby22-base/patches/patch-vm__eval.c
deleted file mode 100644
index 62ba5170ac5..00000000000
--- a/lang/ruby22-base/patches/patch-vm__eval.c
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-vm__eval.c,v 1.1 2015/11/20 14:31:59 joerg Exp $
-
---- vm_eval.c.orig 2015-11-16 14:55:47.000000000 +0000
-+++ vm_eval.c
-@@ -1062,7 +1062,7 @@ rb_iterate(VALUE (* it_proc) (VALUE), VA
- int state;
- volatile VALUE retval = Qnil;
- NODE *node = NEW_IFUNC(bl_proc, data2);
-- rb_thread_t *th = GET_THREAD();
-+ rb_thread_t * volatile th = GET_THREAD();
- rb_control_frame_t *volatile cfp = th->cfp;
-
- node->nd_aid = rb_frame_this_func();
-@@ -1190,7 +1190,7 @@ eval_string_with_cref(VALUE self, VALUE
- int state;
- VALUE result = Qundef;
- VALUE envval;
-- rb_thread_t *th = GET_THREAD();
-+ rb_thread_t *volatile th = GET_THREAD();
- rb_env_t *env = NULL;
- rb_block_t block, *base_block;
- volatile int parse_in_eval;
-@@ -1843,8 +1843,8 @@ rb_catch_protect(VALUE t, rb_block_call_
- {
- int state;
- volatile VALUE val = Qnil; /* OK */
-- rb_thread_t *th = GET_THREAD();
-- rb_control_frame_t *saved_cfp = th->cfp;
-+ rb_thread_t * volatile th = GET_THREAD();
-+ rb_control_frame_t * volatile saved_cfp = th->cfp;
- volatile VALUE tag = t;
-
- TH_PUSH_TAG(th);
diff --git a/lang/ruby22-base/patches/patch-vm__trace.c b/lang/ruby22-base/patches/patch-vm__trace.c
deleted file mode 100644
index e56c70e7f84..00000000000
--- a/lang/ruby22-base/patches/patch-vm__trace.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-vm__trace.c,v 1.1 2015/11/20 14:31:59 joerg Exp $
-
---- vm_trace.c.orig 2015-11-16 15:02:00.000000000 +0000
-+++ vm_trace.c
-@@ -390,7 +390,7 @@ rb_suppress_tracing(VALUE (*func)(VALUE)
- volatile int raised;
- volatile int outer_state;
- VALUE result = Qnil;
-- rb_thread_t *th = GET_THREAD();
-+ rb_thread_t * volatile th = GET_THREAD();
- int state;
- const int tracing = th->trace_arg ? 1 : 0;
- rb_trace_arg_t dummy_trace_arg;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-17 18:41:29 +0000