diff options
| author | taca <taca> | 2012-03-21 15:47:33 +0000 |
|---|---|---|
| committer | taca <taca> | 2012-03-21 15:47:33 +0000 |
| commit | ccbd6c9c91783793f34617848f901bc1c790f039 (patch) | |
| tree | 243eb5b8345cb3df37dd9c530ce54e89b8e13888 /lang | |
| parent | 31455af8b724fafa0bff70865d715650b13eb5f6 (diff) | |
| download | pkgsrc-ccbd6c9c91783793f34617848f901bc1c790f039.tar.gz | |
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 (limited to 'lang')
| -rw-r--r-- | lang/ruby/rubyversion.mk | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index 9246eaee123..525c7047ade 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -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_DISTNAME?= ruby-${RUBY_VERSION} 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_GENERATE_PLIST = ( \ ${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}/ \ |