[41531] trunk/dports/lang/ruby

[kimuraw at macports.org]

Revision: 41531
          http://trac.macports.org/changeset/41531
Author:   kimuraw at macports.org
Date:     2008-11-05 08:38:26 -0800 (Wed, 05 Nov 2008)
Log Message:
-----------
lang/ruby: 1.8.7-p72_2
  - add a patch to ignore getcontext()/setcontext() on 10.5.
    ruby 1.8.6 Portfile included this patch as "ignore-gsetcontext.diff".
    this patch is effective for ruby 1.8.7.
  - stop to disable "--enable-pthread" on 10.5 ppc (the above patch solve a
    problem, SEGV on 10.5 ppc)

Modified Paths:
--------------
    trunk/dports/lang/ruby/Portfile

Added Paths:
-----------
    trunk/dports/lang/ruby/files/patch-node.h.diff

Modified: trunk/dports/lang/ruby/Portfile
===================================================================
--- trunk/dports/lang/ruby/Portfile	2008-11-05 16:10:07 UTC (rev 41530)
+++ trunk/dports/lang/ruby/Portfile	2008-11-05 16:38:26 UTC (rev 41531)
@@ -4,7 +4,7 @@
 
 name			ruby
 version			1.8.7-p72
-revision		1
+revision		2
 
 categories		lang ruby
 maintainers		kimuraw
@@ -38,7 +38,7 @@
 				patch-mkmf.rb \
 				patch-mkconfig.rb \
 				patch-socket.c \
-				patch-test_socket.rb \
+				patch-test_socket.rb
 
 # http://trac.macports.org/ticket/16853
 # abandon wrapping if the line contains no space.
@@ -46,6 +46,11 @@
 # http://redmine.ruby-lang.org/issues/show/516
 patchfiles-append patch-lib-rexml-formatters-pretty.rb.diff
 
+# ignore getcontext() and setcontext()
+# on 10.5, these functions have some problems (SEGV on ppc, slower than 1.8.6)
+# http://chopine.be/lrz/ruby-osx-patches/ignore-gsetcontext.diff
+patchfiles-append patch-node.h.diff
+
 use_autoconf	yes
 use_parallel_build      yes
 
@@ -83,12 +88,6 @@
 	configure.args-delete	--enable-pthread
 }
 
-platform darwin 9 powerpc {
-	# pthreads breaks ruby-1.8.7 on 10.5 ppc
-	# http://trac.macports.org/ticket/15635
-	configure.args-delete   --enable-pthread
-}
-
 variant tk conflicts mactk description "enable tk support" {
 	configure.args-delete	--without-tk
 	configure.args-append	--with-tk

Added: trunk/dports/lang/ruby/files/patch-node.h.diff
===================================================================
--- trunk/dports/lang/ruby/files/patch-node.h.diff	                        (rev 0)
+++ trunk/dports/lang/ruby/files/patch-node.h.diff	2008-11-05 16:38:26 UTC (rev 41531)
@@ -0,0 +1,23 @@
+--- node.h.orig	2008-07-07 15:17:24.000000000 +0900
++++ node.h	2008-11-06 00:53:06.000000000 +0900
+@@ -375,9 +375,17 @@
+ void rb_add_event_hook _((rb_event_hook_func_t,rb_event_t));
+ int rb_remove_event_hook _((rb_event_hook_func_t));
+ 
+-#if defined(HAVE_GETCONTEXT) && defined(HAVE_SETCONTEXT)
+-#include <ucontext.h>
+-#define USE_CONTEXT
++#if defined(HAVE_GETCONTEXT) && defined(HAVE_SETCONTEXT) 
++# if defined(__APPLE__)
++#   include <AvailabilityMacros.h>
++#   if MAC_OS_X_VERSION_MAX_ALLOWED <= 1040
++#     include <ucontext.h>
++#     define USE_CONTEXT
++#   endif
++# else
++#   include <ucontext.h>
++#   define USE_CONTEXT
++# endif
+ #endif
+ #include <setjmp.h>
+ #include "st.h"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081105/d2d03598/attachment.html>