[pkgsrc/trunk]: pkgsrc/lang/ruby - Introduce experimental RUBY_USE_PTHREAD; u...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/43192e2c2583
branches:  trunk
changeset: 518555:43192e2c2583
user:      taca <taca%pkgsrc.org@localhost>
date:      Wed Sep 13 12:56:46 2006 +0000

description:
- Introduce experimental RUBY_USE_PTHREAD; using pthread could be disabled
  setting to "no" in /etc/mk.conf.  (Default is "yes" on most platform.)

- Correct condition of including pthread.buildlink3.mk.

Tested on NetBSD current, SuSE Linux 9.3 and DragonFly BSD 1.6.0.

Thanks for advise from Vincent Hourdin and Joerg Sonnenberger.

diffstat:

 lang/ruby/Makefile.common |   4 ++--
 lang/ruby/rubyversion.mk  |  20 +++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diffs (66 lines):

diff -r 9d69bbeae1bf -r 43192e2c2583 lang/ruby/Makefile.common
--- a/lang/ruby/Makefile.common Wed Sep 13 12:51:58 2006 +0000
+++ b/lang/ruby/Makefile.common Wed Sep 13 12:56:46 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2006/09/08 02:36:51 taca Exp $
+# $NetBSD: Makefile.common,v 1.13 2006/09/13 12:56:46 taca Exp $
 #
 # Ruby base distribution common definition
 
@@ -41,7 +41,7 @@
 
 .include "replace.mk"
 
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
+.if !empty(RUBY_USE_PTHREAD:M[nN][oO])
 CONFIGURE_ARGS+=       --disable-pthread
 .else
 CONFIGURE_ARGS+=       --enable-pthread
diff -r 9d69bbeae1bf -r 43192e2c2583 lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk  Wed Sep 13 12:51:58 2006 +0000
+++ b/lang/ruby/rubyversion.mk  Wed Sep 13 12:56:46 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.25 2006/09/08 23:32:13 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.26 2006/09/13 12:56:46 taca Exp $
 #
 
 .if !defined(_RUBYVERSION_MK)
@@ -147,11 +147,6 @@
 RUBY_NOSHLIBMAJOR=
 .endif
 
-.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.[0-9].*)
-RUBY_NOPTHREAD=        yes
-.else
-RUBY_NOPTHREAD=        no
-.endif
 
 #
 # RUBY_DLEXT is suffix of extention library.
@@ -163,6 +158,17 @@
 .endif
 
 #
+# Use pthread library with Ruby
+#
+.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.[0-9].*)
+RUBY_USE_PTHREAD?=     no
+.else
+RUBY_USE_PTHREAD?=     yes
+PTHREAD_OPTS+=         native
+#PTHREAD_AUTO_VARS=    yes
+.endif
+
+#
 # Dynamic PLIST directories
 #
 RUBY_DYNAMIC_DIRS?=    # empty
@@ -265,7 +271,7 @@
 .endif
 
 .if !empty(RUBY_NOVERSION:M[nN][oO])
-.if !empty(RUBY_NOPTHREAD:M[nN][oO])
+.if empty(RUBY_USE_PTHREAD:M[nN][oO])
 .include "../../mk/pthread.buildlink3.mk"
 .endif
 .include "../../mk/bdb.buildlink3.mk"