pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/ruby Move back CONFIGURE_ARGS part from rubyversi...
details: https://anonhg.NetBSD.org/pkgsrc/rev/688fbac54597
branches: trunk
changeset: 518391:688fbac54597
user: taca <taca%pkgsrc.org@localhost>
date: Fri Sep 08 02:36:51 2006 +0000
description:
Move back CONFIGURE_ARGS part from rubyversion.mk to Makefile.common.
diffstat:
lang/ruby/Makefile.common | 8 +++++++-
lang/ruby/rubyversion.mk | 11 ++---------
2 files changed, 9 insertions(+), 10 deletions(-)
diffs (46 lines):
diff -r 5afe930c169f -r 688fbac54597 lang/ruby/Makefile.common
--- a/lang/ruby/Makefile.common Thu Sep 07 23:35:25 2006 +0000
+++ b/lang/ruby/Makefile.common Fri Sep 08 02:36:51 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2006/09/07 15:40:00 taca Exp $
+# $NetBSD: Makefile.common,v 1.12 2006/09/08 02:36:51 taca Exp $
#
# Ruby base distribution common definition
@@ -40,3 +40,9 @@
RUBY_NAME=${RUBY_NAME:Q}
.include "replace.mk"
+
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
+CONFIGURE_ARGS+= --disable-pthread
+.else
+CONFIGURE_ARGS+= --enable-pthread
+.endif
diff -r 5afe930c169f -r 688fbac54597 lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk Thu Sep 07 23:35:25 2006 +0000
+++ b/lang/ruby/rubyversion.mk Fri Sep 08 02:36:51 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.23 2006/09/07 15:40:00 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.24 2006/09/08 02:36:51 taca Exp $
#
.if !defined(_RUBYVERSION_MK)
@@ -260,16 +260,9 @@
.if !empty(RUBY_NOVERSION:M[nN][oO])
# Common macros.
-.if ${OPSYS} == "NetBSD"
-.if empty(OS_VERSION:M1.[0-9].*)
+.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M1.[0-9].*)
PTHREAD_OPTS+= native
.include "../../mk/pthread.buildlink3.mk"
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
-CONFIGURE_ARGS+= --disable-pthread
-.else
-CONFIGURE_ARGS+= --enable-pthread
-.endif
-.endif
.endif
.include "../../mk/bdb.buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index