diff options
| author | taca <taca@pkgsrc.org> | 2006-09-03 02:53:13 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2006-09-03 02:53:13 +0000 |
| commit | 8d0a1d017450f3ac2f311942c8cb728bede011a0 (patch) | |
| tree | 3b9abb2dd0e0b46b865e3993886ab7f4bb986d67 /lang | |
| parent | 45969ba4364a4c60ad6ee9f0af91760712969290 (diff) | |
| download | pkgsrc-8d0a1d017450f3ac2f311942c8cb728bede011a0.tar.gz | |
Move buildlinks from ruby18-base/Makefile to ruby/rubyversion.mk.
It should help for fixing the build problem of some extention libraries.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ruby/rubyversion.mk | 15 | ||||
| -rw-r--r-- | lang/ruby18-base/Makefile | 11 |
2 files changed, 15 insertions, 11 deletions
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index 316446f9044..b97506512c2 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.21 2006/01/05 07:04:47 taca Exp $ +# $NetBSD: rubyversion.mk,v 1.22 2006/09/03 02:53:13 taca Exp $ # .if !defined(_RUBYVERSION_MK) @@ -214,4 +214,17 @@ PLIST_SUBST+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \ RUBY_DLEXT=${RUBY_DLEXT:Q} \ ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",} +.if !empty(RUBY_NOVERSION:M[nN][oO]) +# +# Use Berkley DB unless a system has real ndbm(3). +# +.include "../../mk/dlopen.buildlink3.mk" +.if !exists(/usr/include/ndbm.h) +.include "../../mk/bdb.buildlink3.mk" +.endif +.include "../../mk/pthread.buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" +.endif + .endif # _RUBY_MK diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile index 538d14285a0..226a7087a4d 100644 --- a/lang/ruby18-base/Makefile +++ b/lang/ruby18-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/08/02 07:02:44 taca Exp $ +# $NetBSD: Makefile,v 1.24 2006/09/03 02:53:13 taca Exp $ # DISTNAME= ${RUBY_DISTNAME} @@ -43,13 +43,6 @@ CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX:Q} FILES_SUBST+= DATE=${DATE:Q} # -# Use Berkley DB unless a system has real ndbm(3). -# -.if !exists(/usr/include/ndbm.h) -.include "../../mk/bdb.buildlink3.mk" -.endif - -# # IRIX work around which should be fixed. # .if ${OPSYS} == "IRIX" @@ -135,6 +128,4 @@ post-install: .endfor .include "../../lang/ruby/Makefile.common" -.include "../../devel/zlib/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |