summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authortaca <taca>2006-09-08 23:32:13 +0000
committertaca <taca>2006-09-08 23:32:13 +0000
commitf7fad18bbd26094a353b426251c79a0a436636e6 (patch)
tree209d12fe39df6b91b162774b0a4de244518334d6 /lang
parente26ad966eaeca886e85cca4a833a42facc1343ef (diff)
downloadpkgsrc-f7fad18bbd26094a353b426251c79a0a436636e6.tar.gz
Make sure to revert pthread handling as before.
Diffstat (limited to 'lang')
-rw-r--r--lang/ruby/rubyversion.mk12
1 files changed, 8 insertions, 4 deletions
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index deedf4685e1..e8f48b6f0d4 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -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= "@comment "
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 @@ RUBY_GENERATE_PLIST = ( \
.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"