Wed Nov 6 12:42:35 2013 UTC ()
Use MACHINE_GNU_ARCH instead of MACHINE_ARCH.

Fix build problem on NetBSD/i386.


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

--- pkgsrc/lang/ruby/rubyversion.mk 2013/10/29 23:25:33 1.103
+++ pkgsrc/lang/ruby/rubyversion.mk 2013/11/06 12:42:35 1.104
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: rubyversion.mk,v 1.103 2013/10/29 23:25:33 taca Exp $ 1# $NetBSD: rubyversion.mk,v 1.104 2013/11/06 12:42:35 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: 18 193 200 13# Possible values: 18 193 200
14# Default: 193 14# Default: 193
@@ -308,27 +308,27 @@ RUBY_VER_DIR= ${RUBY_VERSION} @@ -308,27 +308,27 @@ RUBY_VER_DIR= ${RUBY_VERSION}
308.endif 308.endif
309 309
310.if empty(RUBY_NOVERSION:M[nN][oO]) 310.if empty(RUBY_NOVERSION:M[nN][oO])
311RUBY_SUFFIX= 311RUBY_SUFFIX=
312RUBY_NAME= ruby 312RUBY_NAME= ruby
313.endif 313.endif
314 314
315RUBY_BUILD_RDOC?= Yes 315RUBY_BUILD_RDOC?= Yes
316RUBY_BUILD_RI?= Yes 316RUBY_BUILD_RI?= Yes
317 317
318RUBY?= ${PREFIX}/bin/${RUBY_NAME} 318RUBY?= ${PREFIX}/bin/${RUBY_NAME}
319RDOC?= ${PREFIX}/bin/rdoc${RUBY_VER} 319RDOC?= ${PREFIX}/bin/rdoc${RUBY_VER}
320 320
321RUBY_ARCH?= ${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX} 321RUBY_ARCH?= ${MACHINE_GNU_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}
322 322
323# 323#
324# Ruby shared and static library version handling. 324# Ruby shared and static library version handling.
325# 325#
326RUBY_SHLIBVER?= ${RUBY_API_VERSION} 326RUBY_SHLIBVER?= ${RUBY_API_VERSION}
327RUBY_SHLIB?= ${RUBY_VER}.${RUBY_SLEXT}.${RUBY_SHLIBVER} 327RUBY_SHLIB?= ${RUBY_VER}.${RUBY_SLEXT}.${RUBY_SHLIBVER}
328RUBY_SHLIBALIAS?= @comment 328RUBY_SHLIBALIAS?= @comment
329RUBY_STATICLIB?= ${RUBY_VER}-static.a 329RUBY_STATICLIB?= ${RUBY_VER}-static.a
330 330
331.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Interix" 331.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Interix"
332RUBY_SHLIBVER= ${_RUBY_API_MAJOR}.${_RUBY_API_MINOR} 332RUBY_SHLIBVER= ${_RUBY_API_MAJOR}.${_RUBY_API_MINOR}
333_RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLEXT}.${_RUBY_API_MAJOR} 333_RUBY_SHLIBALIAS= ${RUBY_VER}.${RUBY_SLEXT}.${_RUBY_API_MAJOR}
334.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" 334.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"