pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/ruby Make sure to revert pthread handling as before.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/60132b1e8067
branches:  trunk
changeset: 518417:60132b1e8067
user:      taca <taca%pkgsrc.org@localhost>
date:      Fri Sep 08 23:32:13 2006 +0000

description:
Make sure to revert pthread handling as before.

diffstat:

 lang/ruby/rubyversion.mk |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 80f8cdb767c9 -r 60132b1e8067 lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk  Fri Sep 08 19:25:02 2006 +0000
+++ b/lang/ruby/rubyversion.mk  Fri Sep 08 23:32:13 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.24 2006/09/08 02:36:51 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.25 2006/09/08 23:32:13 taca Exp $
 #
 
 .if !defined(_RUBYVERSION_MK)
@@ -147,6 +147,12 @@
 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.
 #
@@ -259,9 +265,7 @@
 .endif
 
 .if !empty(RUBY_NOVERSION:M[nN][oO])
-# Common macros.
-.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M1.[0-9].*)
-PTHREAD_OPTS+=  native
+.if !empty(RUBY_NOPTHREAD:M[nN][oO])
 .include "../../mk/pthread.buildlink3.mk"
 .endif
 .include "../../mk/bdb.buildlink3.mk"



Home | Main Index | Thread Index | Old Index