summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjperkin <jperkin>2017-06-30 11:44:15 +0000
committerjperkin <jperkin>2017-06-30 11:44:15 +0000
commitbea871509c400fb59e9573a72690149c694b6e86 (patch)
treef0011c765bf07c979609d8c96dde2d41b4384011 /lang
parentb7533fc645fc7a9963bc05b0ec7ae26912e77900 (diff)
downloadpkgsrc-bea871509c400fb59e9573a72690149c694b6e86.tar.gz
Fix static library name on Darwin, from minskim@.
Diffstat (limited to 'lang')
-rw-r--r--lang/ruby/rubyversion.mk7
1 files changed, 3 insertions, 4 deletions
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index a8a7ccc67cf..23edc68bebd 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.180 2017/06/20 13:41:45 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.181 2017/06/30 11:44:15 jperkin Exp $
#
# This file determines which Ruby version is used as a dependency for
@@ -413,7 +413,7 @@ RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${_RUBY_SHLIB_MINOR}
.elif ${OPSYS} == "Darwin"
RUBY_SHLIB= ${RUBY_SUFFIX}.${RUBY_SHLIBVER}.${RUBY_SLEXT}
_RUBY_SHLIBALIAS= .${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT}
-RUBY_STATICLIB= ${RUBY_SUFFIX}.${RUBY_SHLIB_VERSION}-static.a
+RUBY_STATICLIB= ${RUBY_SUFFIX}.${RUBY_SHLIBVER}-static.a
.elif ${OPSYS} == "Linux"
_RUBY_SHLIBALIAS= ${RUBY_SUFFIX}.${RUBY_SLEXT}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}
.elif ${OPSYS} == "SunOS"
@@ -534,8 +534,7 @@ PLIST_SUBST+= \
RUBY_VERSION=${RUBY_VERSION:Q} RUBY_VER_DIR=${RUBY_VER_DIR:Q} \
RUBY_DLEXT=${RUBY_DLEXT} RUBY_SLEXT=${RUBY_SLEXT} \
RUBY_SHLIB=${RUBY_SHLIB:Q} RUBY_SHLIBALIAS=${RUBY_SHLIBALIAS:Q} \
- RUBY_STATICLIB=${RUBY_STATICLIB:Q} \
- RUBY_SHLIBI_VERSION=${RUBY_SHLIB_VERSION:Q} RUBY_ARCH=${RUBY_ARCH:Q} \
+ RUBY_STATICLIB=${RUBY_STATICLIB:Q} RUBY_ARCH=${RUBY_ARCH:Q} \
${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",} \
RUBY_MAJOR_MINOR=${RUBY_MAJOR_MINOR} \
RUBY_RAKE_VERSION=${RUBY_RAKE_VERSION} \