CVS commit: pkgsrc/lang/ruby23-base

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Mon Jul 24 13:38:42 UTC 2017

Modified Files:
        pkgsrc/lang/ruby23-base: distinfo
Added Files:
        pkgsrc/lang/ruby23-base/patches: patch-compile.c

Log Message:
Fix build problem when set PKGSRC_USE_STACK_CHECK to "yes", which reported
by wiz@ via private mail.

The problem exists basic use of auto variable.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/ruby23-base/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/ruby23-base/patches/patch-compile.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ruby23-base/distinfo
diff -u pkgsrc/lang/ruby23-base/distinfo:1.7 pkgsrc/lang/ruby23-base/distinfo:1.8
--- pkgsrc/lang/ruby23-base/distinfo:1.7        Thu Jul  6 16:35:05 2017
+++ pkgsrc/lang/ruby23-base/distinfo    Mon Jul 24 13:38:42 2017
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.7 2017/07/06 16:35:05 taca Exp $
+$NetBSD: distinfo,v 1.8 2017/07/24 13:38:42 taca Exp $
 
 SHA1 (ruby-2.3.4.tar.bz2) = f5b18e7149ec7620444c91962e695708829d0216
 RMD160 (ruby-2.3.4.tar.bz2) = a44c9f342a401e75c33a2442b9460b2b1ef7f0f5
 SHA512 (ruby-2.3.4.tar.bz2) = ad1f16142615498232d0de85149585be1d2c5de2bc40ec160d272a09e098ef6f317d8b25026001735261fd1c5bc0d1f8513a8474e89f0d86eed5b2fe7338d64e
 Size (ruby-2.3.4.tar.bz2) = 14434361 bytes
+SHA1 (patch-compile.c) = c17c1b4088bd4e7be0212b78ec0215d27013a52c
 SHA1 (patch-configure) = 9325d9527e96a8f56078c6b78d3f1334803b0d94
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
 SHA1 (patch-ext_openssl_ossl__ssl.c) = 24e794aae278da6204e29212d9e2add0b0119ea4

Added files:

Index: pkgsrc/lang/ruby23-base/patches/patch-compile.c
diff -u /dev/null pkgsrc/lang/ruby23-base/patches/patch-compile.c:1.1
--- /dev/null   Mon Jul 24 13:38:42 2017
+++ pkgsrc/lang/ruby23-base/patches/patch-compile.c     Mon Jul 24 13:38:42 2017
@@ -0,0 +1,20 @@
+$NetBSD: patch-compile.c,v 1.1 2017/07/24 13:38:42 taca Exp $
+
+This chanage included in r57971; moving declaration of new_opt to outside
+of "if"'s block.  So, new_opt is still available outside of "if"'s block.
+
+It cause problem when PKGSRC_USE_STACK_CHECK is enabled.
+
+--- compile.c.orig     2017-02-07 17:39:54.000000000 +0000
++++ compile.c
+@@ -5993,8 +5993,9 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_
+       }
+       case NODE_PRELUDE:{
+       const rb_compile_option_t *orig_opt = ISEQ_COMPILE_DATA(iseq)->option;
++      rb_compile_option_t new_opt;
+       if (node->nd_orig) {
+-          rb_compile_option_t new_opt = *orig_opt;
++          new_opt = *orig_opt;
+           rb_iseq_make_compile_option(&new_opt, node->nd_orig);
+           ISEQ_COMPILE_DATA(iseq)->option = &new_opt;
+       }