pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/ruby Oops, this is one more file to be commited.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d058dd7b3e6f
branches:  trunk
changeset: 601473:d058dd7b3e6f
user:      taca <taca%pkgsrc.org@localhost>
date:      Wed Mar 21 15:47:33 2012 +0000

description:
Oops, this is one more file to be commited.

Overhaul buildlink3 processing of Ruby.

* Don't buildlink in ruby/rubyversion.mk any more but define
  RUBY_USE_PTHREAD (use of pthread).
* In ruby/buildlink3.mk, buildlink via mk/pthread.buildlink3.mk as to
  RUBY_USE_PTHREAD.
* Also the same logic in ruby/Makefile.common.
* Buildlink of bdb, libiconv, zlib, openssl in each ruby*-base/Makefile.

diffstat:

 lang/ruby/rubyversion.mk |  15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)

diffs (36 lines):

diff -r aaa46d491ba5 -r d058dd7b3e6f lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk  Wed Mar 21 15:45:47 2012 +0000
+++ b/lang/ruby/rubyversion.mk  Wed Mar 21 15:47:33 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.75 2012/03/15 08:35:24 marino Exp $
+# $NetBSD: rubyversion.mk,v 1.76 2012/03/21 15:47:33 taca Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -375,8 +375,6 @@
 RUBY_USE_PTHREAD?=     no
 .else
 RUBY_USE_PTHREAD?=     yes
-PTHREAD_OPTS+=         native
-PTHREAD_AUTO_VARS=     yes
 .endif
 
 RUBY_DYNAMIC_DIRS?=    # empty
@@ -510,17 +508,6 @@
        ${RUBY_PLIST_FILES_CMD} ) > ${RUBY_PLIST_DYNAMIC}
 .endif
 
-.if !empty(RUBY_NOVERSION:M[nN][oO])
-.if empty(RUBY_USE_PTHREAD:M[nN][oO])
-.include "../../mk/pthread.buildlink3.mk"
-.endif
-.include "../../mk/bdb.buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-.endif
-
 PRINT_PLIST_AWK+=      /lib\/libruby${RUBY_STATICLIB}$$/ \
                        { sub(/${RUBY_STATICLIB}/, "$${RUBY_STATICLIB}"); }
 PRINT_PLIST_AWK+=      /lib\/libruby${RUBY_VER}\.${RUBY_SLEXT}/ \



Home | Main Index | Thread Index | Old Index