pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/ruby Change to improve frame work and to prepare ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/22e6515679d1
branches: trunk
changeset: 631773:22e6515679d1
user: taca <taca%pkgsrc.org@localhost>
date: Thu Mar 13 17:06:12 2014 +0000
description:
Change to improve frame work and to prepare to support Ruby 2.1.1.
* Replace RUBY210_* to RUBY21_* for Ruby 2.1.1. And RUBY_VER of
value "21" would support Ruby 2.1.1.
* Make RUBY_SUFFIX to contain major-minor-teeny. (It is not always
the same as RUBY_VER any more.)
* Make RUBY_SRCDIR to relative path.
diffstat:
lang/ruby/rubyversion.mk | 60 ++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 27 deletions(-)
diffs (181 lines):
diff -r 4044403e1133 -r 22e6515679d1 lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk Thu Mar 13 16:43:32 2014 +0000
+++ b/lang/ruby/rubyversion.mk Thu Mar 13 17:06:12 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.111 2014/03/13 16:15:46 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.112 2014/03/13 17:06:12 taca Exp $
#
# This file determines which Ruby version is used as a dependency for
@@ -115,7 +115,7 @@
# Name of ruby base package's name.
#
# RUBY_SRCDIR
-# Directory of base ruby package.
+# Relative path to directory of base ruby package.
#
# RUBY_SHLIBVER
# Suffix of libruby shared library's version.
@@ -202,7 +202,12 @@
.if defined(PKGNAME_REQD)
. if !empty(PKGNAME_REQD:Mruby[0-9][0-9][0-9]-*) || !empty(PKGNAME_REQD:Mruby[0-9][0-9]-*)
+_RUBY_VERSION_REQD:= ${PKGNAME_REQD:C/ruby([0-9][0-9]+)-.*/\1/}
+. if ${_RUBY_VERSION_REQD} != "211"
RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9]+)-.*/\1/}
+. else
+RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9])[0-9]-.*/\1/}
+. endif
. endif
.endif
@@ -210,24 +215,23 @@
RUBY18_VERSION= 1.8.7
RUBY193_VERSION= 1.9.3
RUBY200_VERSION= 2.0.0
-RUBY210_VERSION= 2.1.0
+RUBY21_VERSION= 2.1.1
# patch
RUBY18_PATCHLEVEL= pl374
RUBY193_PATCHLEVEL= p484
RUBY200_PATCHLEVEL= p353
-RUBY210_PATCHLEVEL=
# current API compatible version; used for version of shared library
RUBY18_API_VERSION= 1.8.7
RUBY193_API_VERSION= 1.9.1
RUBY200_API_VERSION= 2.0.0
-RUBY210_API_VERSION= 2.1.0
+RUBY21_API_VERSION= 2.1.0
#
RUBY_VERSION_DEFAULT?= 193
-RUBY_VERSION_SUPPORTED?= 200 193 18 # 210
+RUBY_VERSION_SUPPORTED?= 200 193 18 # 21
.if defined(RUBY_VERSION_REQD)
. for rv in ${RUBY_VERSION_SUPPORTED}
@@ -253,6 +257,8 @@
RUBY_VER:= ${RUBY_VER_MAP.${RUBY_VER}:U${RUBY_VER}}
+RUBY_SUFFIX?= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}${_RUBY_VER_TEENY}
+
.if ${RUBY_VER} == "18"
RUBY_VERSION= ${RUBY18_VERSION}
RUBY_VERSION_FULL= ${RUBY_VERSION}${RUBY_PATCHLEVEL:S/pl/./}
@@ -260,6 +266,8 @@
RUBY_RDOC_VERSION= 1.0.1
+RUBY_SUFFIX= ${RUBY_VER}
+
.elif ${RUBY_VER} == "193"
RUBY_VERSION= ${RUBY193_VERSION}
RUBY_VERSION_FULL= ${RUBY_VERSION}${RUBY_PATCHLEVEL}
@@ -280,12 +288,12 @@
RUBY_RAKE_VERSION= 0.9.6
RUBY_JSON_VERSION= 1.7.7
-.elif ${RUBY_VER} == "210"
-RUBY_VERSION= ${RUBY210_VERSION}
-RUBY_VERSION_FULL= ${RUBY_VERSION}${RUBY_PATCHLEVEL}
+.elif ${RUBY_VER} == "21"
+RUBY_VERSION= ${RUBY21_VERSION}
+RUBY_VERSION_FULL= ${RUBY_VERSION}
RUBY_ABI_VERSION= ${RUBY_VERSION}
-RUBY_GEMS_VERSION= 2.2.0
+RUBY_GEMS_VERSION= 2.2.2
RUBY_RDOC_VERSION= 4.1.0
RUBY_RAKE_VERSION= 10.1.0
RUBY_JSON_VERSION= 1.8.1
@@ -323,15 +331,13 @@
_RUBY_API_MAJOR= ${RUBY_API_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1\2/}
_RUBY_API_MINOR= ${RUBY_API_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/}
-RUBY_SUFFIX= ${RUBY_VER}
-
RUBY_NAME= ruby${RUBY_SUFFIX}
RUBYGEM_NAME= gem${RUBY_SUFFIX}
RAKE_NAME= rake${RUBY_SUFFIX}
RUBY_ENCODING_ARG?=
-RUBY_BASE= ruby${RUBY_VER}-base
+RUBY_BASE= ${RUBY_NAME}-base
RUBY_PKGPREFIX?= ${RUBY_NAME}
@@ -350,7 +356,7 @@
RUBY_BUILD_RI?= Yes
RUBY?= ${PREFIX}/bin/${RUBY_NAME}
-RDOC?= ${PREFIX}/bin/rdoc${RUBY_VER}
+RDOC?= ${PREFIX}/bin/rdoc${RUBY_SUFFIX}
RUBY_ARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}
@@ -358,16 +364,16 @@
# Ruby shared and static library version handling.
#
RUBY_SHLIBVER?= ${RUBY_API_VERSION}
-RUBY_SHLIB?= ${RUBY_VER}.${RUBY_SLEXT}.${RUBY_SHLIBVER}
+RUBY_SHLIB?= ${RUBY_SUFFIX}.${RUBY_SLEXT}.${RUBY_SHLIBVER}
RUBY_SHLIBALIAS?= @comment
-RUBY_STATICLIB?= ${RUBY_VER}-static.a
+RUBY_STATICLIB?= ${RUBY_SUFFIX}-static.a
.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Interix"
RUBY_SHLIBVER= ${_RUBY_API_MAJOR}.${_RUBY_API_MINOR}
-_RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLEXT}.${_RUBY_API_MAJOR}
+_RUBY_SHLIBALIAS= ${RUBY_SUFFIX}.${RUBY_SLEXT}.${_RUBY_API_MAJOR}
.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
.if ${RUBY_VER} == "18"
-RUBY_SHLIBVER= ${RUBY_VER}
+RUBY_SHLIBVER= ${RUBY_SUFFIX}
.else
RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}${_RUBY_API_MINOR}
.endif
@@ -378,22 +384,22 @@
RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${_RUBY_API_MINOR}
.endif
.elif ${OPSYS} == "Darwin"
-RUBY_SHLIB= ${RUBY_VER}.${RUBY_SHLIBVER}.${RUBY_SLEXT}
+RUBY_SHLIB= ${RUBY_SUFFIX}.${RUBY_SHLIBVER}.${RUBY_SLEXT}
.if ${RUBY_VER} == "18"
-_RUBY_SHLIBALIAS= ${RUBY_VER}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT}
+_RUBY_SHLIBALIAS= ${RUBY_SUFFIX}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT}
.else
_RUBY_SHLIBALIAS= .${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${RUBY_SLEXT}
-RUBY_STATICLIB= ${RUBY_VER}.${RUBY_API_VERSION}-static.a
+RUBY_STATICLIB= ${RUBY_SUFFIX}.${RUBY_API_VERSION}-static.a
.endif
.elif ${OPSYS} == "Linux"
-_RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLEXT}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}
+_RUBY_SHLIBALIAS= ${RUBY_SUFFIX}.${RUBY_SLEXT}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}
.elif ${OPSYS} == "SunOS"
RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}
- _RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLEXT}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${_RUBY_API_MINOR}
+ _RUBY_SHLIBALIAS= ${RUBY_SUFFIX}.${RUBY_SLEXT}.${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}.${_RUBY_API_MINOR}
.elif ${OPSYS} == "Cygwin"
-RUBY_SHLIB= ${RUBY_VER}${_RUBY_API_MAJOR}${_RUBY_API_MINOR}.dll.a
-RUBY_SHLIBALIAS= bin/cygruby${RUBY_VER}${_RUBY_API_MAJOR}${_RUBY_API_MINOR}.dll
-RUBY_STATICLIB= ${RUBY_VER}${_RUBY_API_MAJOR}${_RUBY_API_MINOR}-static.a
+RUBY_SHLIB= ${RUBY_SUFFIX}${_RUBY_API_MAJOR}${_RUBY_API_MINOR}.dll.a
+RUBY_SHLIBALIAS= bin/cygruby${RUBY_SUFFIX}${_RUBY_API_MAJOR}${_RUBY_API_MINOR}.dll
+RUBY_STATICLIB= ${RUBY_SUFFIX}${_RUBY_API_MAJOR}${_RUBY_API_MINOR}-static.a
.endif
.if !empty(_RUBY_SHLIBALIAS)
@@ -432,7 +438,7 @@
RUBY_DYNAMIC_DIRS?= # empty
-RUBY_SRCDIR?= ${_PKGSRC_TOPDIR}/lang/${RUBY_BASE}
+RUBY_SRCDIR?= ../../lang/ruby${RUBY_VER}-base
#
# common paths
Home |
Main Index |
Thread Index |
Old Index