Tue May 30 15:33:49 2017 UTC ()
* Always define RAKE since all ruby2*-base package have it.
* Pass RAKE to MAKE_ENV.


(taca)
diff -r1.175 -r1.176 pkgsrc/lang/ruby/rubyversion.mk
cvs diff -r1.175 -r1.176 pkgsrc/lang/ruby/rubyversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/rubyversion.mk 2017/05/04 07:47:22 1.175
+++ pkgsrc/lang/ruby/rubyversion.mk 2017/05/30 15:33:49 1.176
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: rubyversion.mk,v 1.175 2017/05/04 07:47:22 taca Exp $ 1# $NetBSD: rubyversion.mk,v 1.176 2017/05/30 15:33:49 taca Exp $
2# 2#
3 3
4# This file determines which Ruby version is used as a dependency for 4# This file determines which Ruby version is used as a dependency for
5# a package. 5# a package.
6# 6#
7# 7#
8# === User-settable variables === 8# === User-settable variables ===
9# 9#
10# RUBY_VERSION_DEFAULT 10# RUBY_VERSION_DEFAULT
11# The preferered Ruby version to use. 11# The preferered Ruby version to use.
12# 12#
13# Possible values: 21 22 23 13# Possible values: 21 22 23
14# Default: 23 14# Default: 23
@@ -375,26 +375,27 @@ RUBY_BASE= ${RUBY_NAME}-base @@ -375,26 +375,27 @@ RUBY_BASE= ${RUBY_NAME}-base
375RUBY_PKGPREFIX?= ${RUBY_NAME} 375RUBY_PKGPREFIX?= ${RUBY_NAME}
376 376
377RUBY_VER_DIR= ${RUBY_API_VERSION} 377RUBY_VER_DIR= ${RUBY_API_VERSION}
378 378
379.if empty(RUBY_NOVERSION:M[nN][oO]) 379.if empty(RUBY_NOVERSION:M[nN][oO])
380RUBY_SUFFIX= 380RUBY_SUFFIX=
381RUBY_NAME= ruby 381RUBY_NAME= ruby
382.endif 382.endif
383 383
384RUBY_BUILD_RDOC?= Yes 384RUBY_BUILD_RDOC?= Yes
385RUBY_BUILD_RI?= Yes 385RUBY_BUILD_RI?= Yes
386 386
387RUBY?= ${PREFIX}/bin/${RUBY_NAME} 387RUBY?= ${PREFIX}/bin/${RUBY_NAME}
 388RAKE?= ${PREFIX}/bin/${RAKE_NAME}
388RDOC?= ${PREFIX}/bin/rdoc${RUBY_SUFFIX} 389RDOC?= ${PREFIX}/bin/rdoc${RUBY_SUFFIX}
389 390
390RUBY_ARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}${APPEND_ABI} 391RUBY_ARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}${APPEND_ABI}
391 392
392RUBY_MAJOR_MINOR= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR} 393RUBY_MAJOR_MINOR= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}
393 394
394# 395#
395# Ruby shared and static library version handling. 396# Ruby shared and static library version handling.
396# 397#
397RUBY_SHLIBVER?= ${RUBY_API_VERSION} 398RUBY_SHLIBVER?= ${RUBY_API_VERSION}
398RUBY_SHLIB?= ${RUBY_SUFFIX}.${RUBY_SLEXT}.${RUBY_SHLIBVER} 399RUBY_SHLIB?= ${RUBY_SUFFIX}.${RUBY_SLEXT}.${RUBY_SHLIBVER}
399RUBY_SHLIBALIAS?= @comment 400RUBY_SHLIBALIAS?= @comment
400RUBY_STATICLIB?= ${RUBY_SUFFIX}-static.a 401RUBY_STATICLIB?= ${RUBY_SUFFIX}-static.a
@@ -478,27 +479,28 @@ GEM_HOME?= ${RUBY_GEM_BASE}/${RUBY_VER_ @@ -478,27 +479,28 @@ GEM_HOME?= ${RUBY_GEM_BASE}/${RUBY_VER_
478 479
479# 480#
480# ri database relative path 481# ri database relative path
481# 482#
482RUBY_RIDIR?= share/ri 483RUBY_RIDIR?= share/ri
483RUBY_BASERIDIR?= ${RUBY_RIDIR}/${RUBY_VER_DIR} 484RUBY_BASERIDIR?= ${RUBY_RIDIR}/${RUBY_VER_DIR}
484RUBY_SYSRIDIR?= ${RUBY_BASERIDIR}/system 485RUBY_SYSRIDIR?= ${RUBY_BASERIDIR}/system
485RUBY_SITERIDIR?= ${RUBY_BASERIDIR}/site 486RUBY_SITERIDIR?= ${RUBY_BASERIDIR}/site
486 487
487# 488#
488# MAKE_ENV 489# MAKE_ENV
489# 490#
490MAKE_ENV+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \ 491MAKE_ENV+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \
491 RUBY_VERSION_DEFAULT=${RUBY_VERSION_DEFAULT:Q} 492 RUBY_VERSION_DEFAULT=${RUBY_VERSION_DEFAULT:Q} \
 493 RAKE=${RAKE:Q}
492 494
493MAKEFLAGS+= RUBY_VER=${RUBY_VER:Q} \ 495MAKEFLAGS+= RUBY_VER=${RUBY_VER:Q} \
494 RUBY_VERSION_DEFAULT=${RUBY_VERSION_DEFAULT:Q} 496 RUBY_VERSION_DEFAULT=${RUBY_VERSION_DEFAULT:Q}
495 497
496PLIST_RUBY_DIRS= RUBY_INC=${RUBY_INC:Q} RUBY_ARCHINC=${RUBY_ARCHINC:Q} \ 498PLIST_RUBY_DIRS= RUBY_INC=${RUBY_INC:Q} RUBY_ARCHINC=${RUBY_ARCHINC:Q} \
497 RUBY_LIB_BASE=${RUBY_LIB_BASE:Q} \ 499 RUBY_LIB_BASE=${RUBY_LIB_BASE:Q} \
498 RUBY_LIB=${RUBY_LIB:Q} \ 500 RUBY_LIB=${RUBY_LIB:Q} \
499 RUBY_ARCHLIB=${RUBY_ARCHLIB:Q} \ 501 RUBY_ARCHLIB=${RUBY_ARCHLIB:Q} \
500 RUBY_SITELIB_BASE=${RUBY_SITELIB_BASE:Q} \ 502 RUBY_SITELIB_BASE=${RUBY_SITELIB_BASE:Q} \
501 RUBY_SITELIB=${RUBY_SITELIB:Q} \ 503 RUBY_SITELIB=${RUBY_SITELIB:Q} \
502 RUBY_SITEARCHLIB=${RUBY_SITEARCHLIB:Q} \ 504 RUBY_SITEARCHLIB=${RUBY_SITEARCHLIB:Q} \
503 RUBY_VENDORLIB_BASE=${RUBY_VENDORLIB_BASE:Q} \ 505 RUBY_VENDORLIB_BASE=${RUBY_VENDORLIB_BASE:Q} \
504 RUBY_VENDORLIB=${RUBY_VENDORLIB:Q} \ 506 RUBY_VENDORLIB=${RUBY_VENDORLIB:Q} \