svn commit: r341124 - in head: Mk lang/ruby19/files lang/ruby20/files

[Steve Wills]

Author: swills
Date: Sat Jan 25 22:10:56 2014
New Revision: 341124
URL: http://svnweb.freebsd.org/changeset/ports/341124
QAT: https://qat.redports.org/buildarchive/r341124/

Log:
  - Add patch to increase stack size to avoid crash on ppc64
  - Bump PORTREVISION due to binary and package change
  
  Submitted by:	jhibbits (via private email)

Added:
  head/lang/ruby19/files/patch-thread_pthread.c   (contents, props changed)
  head/lang/ruby20/files/patch-thread_pthread.c   (contents, props changed)
Modified:
  head/Mk/bsd.ruby.mk

Modified: head/Mk/bsd.ruby.mk
==============================================================================
--- head/Mk/bsd.ruby.mk	Sat Jan 25 22:09:37 2014	(r341123)
+++ head/Mk/bsd.ruby.mk	Sat Jan 25 22:10:56 2014	(r341124)
@@ -177,7 +177,7 @@ RUBY?=			${LOCALBASE}/bin/${RUBY_NAME}
 # Ruby 1.9
 #
 RUBY_RELVERSION=	1.9.3
-RUBY_PORTREVISION=	0
+RUBY_PORTREVISION=	1
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	484
 
@@ -204,7 +204,7 @@ RUBY20=			"@comment "
 # Ruby 2.0
 #
 RUBY_RELVERSION=	2.0.0
-RUBY_PORTREVISION=	3
+RUBY_PORTREVISION=	4
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	353
 

Added: head/lang/ruby19/files/patch-thread_pthread.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/ruby19/files/patch-thread_pthread.c	Sat Jan 25 22:10:56 2014	(r341124)
@@ -0,0 +1,19 @@
+--- thread_pthread.c.orig	2013-03-28 10:10:00.000000000 +0000
++++ thread_pthread.c	2014-01-25 02:59:12.085473158 +0000
+@@ -1193,13 +1193,13 @@
+ 
+ 	pthread_attr_init(&attr);
+ #ifdef PTHREAD_STACK_MIN
+-	if (PTHREAD_STACK_MIN < 4096 * 3) {
++	if (PTHREAD_STACK_MIN < 4096 * 4) {
+ 	    /* Allocate the machine stack for the timer thread
+-             * at least 12KB (3 pages).  FreeBSD 8.2 AMD64 causes
++             * at least 16KB (4 pages).  FreeBSD 8.2 AMD64 causes
+              * machine stack overflow only with PTHREAD_STACK_MIN.
+ 	     */
+ 	    pthread_attr_setstacksize(&attr,
+-				      4096 * 3 + (THREAD_DEBUG ? BUFSIZ : 0));
++				      4096 * 4 + (THREAD_DEBUG ? BUFSIZ : 0));
+ 	}
+ 	else {
+ 	    pthread_attr_setstacksize(&attr,

Added: head/lang/ruby20/files/patch-thread_pthread.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/ruby20/files/patch-thread_pthread.c	Sat Jan 25 22:10:56 2014	(r341124)
@@ -0,0 +1,19 @@
+--- thread_pthread.c.orig	2013-05-01 15:40:57.000000000 +0000
++++ thread_pthread.c	2014-01-25 03:00:55.044466722 +0000
+@@ -1420,13 +1420,13 @@
+ 	    exit(EXIT_FAILURE);
+         }
+ # ifdef PTHREAD_STACK_MIN
+-	if (PTHREAD_STACK_MIN < 4096 * 3) {
++	if (PTHREAD_STACK_MIN < 4096 * 4) {
+ 	    /* Allocate the machine stack for the timer thread
+-             * at least 12KB (3 pages).  FreeBSD 8.2 AMD64 causes
++             * at least 16KB (4 pages).  FreeBSD 8.2 AMD64 causes
+              * machine stack overflow only with PTHREAD_STACK_MIN.
+ 	     */
+ 	    pthread_attr_setstacksize(&attr,
+-				      4096 * 3 + (THREAD_DEBUG ? BUFSIZ : 0));
++				      4096 * 4 + (THREAD_DEBUG ? BUFSIZ : 0));
+ 	}
+ 	else {
+ 	    pthread_attr_setstacksize(&attr,