diff options
| author | taca <taca> | 2012-03-21 15:40:12 +0000 |
|---|---|---|
| committer | taca <taca> | 2012-03-21 15:40:12 +0000 |
| commit | b212165e093d6e541aaeb197d7fae78527c71bc0 (patch) | |
| tree | 538409ba4c8a17c31aa79e1f12adc0b28b094d02 /lang/ruby | |
| parent | f34a2a4ad8271759e5ea62a11a4e85955551fee1 (diff) | |
| download | pkgsrc-b212165e093d6e541aaeb197d7fae78527c71bc0.tar.gz | |
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/ruby')
| -rw-r--r-- | lang/ruby/Makefile.common | 8 | ||||
| -rw-r--r-- | lang/ruby/buildlink3.mk | 11 |
2 files changed, 17 insertions, 2 deletions
diff --git a/lang/ruby/Makefile.common b/lang/ruby/Makefile.common index 82972a08ba5..f00bf6030d4 100644 --- a/lang/ruby/Makefile.common +++ b/lang/ruby/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.26 2012/02/18 06:28:46 taca Exp $ +# $NetBSD: Makefile.common,v 1.27 2012/03/21 15:40:12 taca Exp $ # # Ruby base distribution common definition # used by databases/ruby-gdbm/Makefile @@ -88,4 +88,10 @@ do-patch: CONFIGURE_ARGS+= --disable-pthread .else CONFIGURE_ARGS+= --enable-pthread + +PTHREAD_OPTS+= native +PTHREAD_AUTO_VARS= yes + +.include "../../mk/pthread.buildlink3.mk" .endif +.include "../../mk/dlopen.buildlink3.mk" diff --git a/lang/ruby/buildlink3.mk b/lang/ruby/buildlink3.mk index b6c9c8d2931..b449c4091d8 100644 --- a/lang/ruby/buildlink3.mk +++ b/lang/ruby/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2011/11/08 15:19:01 taca Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2012/03/21 15:40:12 taca Exp $ BUILDLINK_TREE+= ${RUBY_BASE} @@ -23,6 +23,15 @@ buildlink-bin-ruby: if ${TEST} -f $$f; then \ ${LN} -s $$f ${BUILDLINK_DIR}/bin/ruby; \ fi + +.if empty(RUBY_USE_PTHREAD:M[nN][oO]) +PTHREAD_OPTS+= native +PTHREAD_AUTO_VARS= yes + +.include "../../mk/pthread.buildlink3.mk" +.endif +.include "../../mk/dlopen.buildlink3.mk" + .endif # RUBY_BUILDLINK3_MK BUILDLINK_TREE+= -${RUBY_BASE} |