Wed May 31 10:27:37 2017 UTC ()
Do not always execute ${RUBYGEM}.

Thanks for wiz@ who noted via private e-mail.


(taca)
diff -r1.6 -r1.7 pkgsrc/lang/ruby/gem-vars.mk
cvs diff -r1.6 -r1.7 pkgsrc/lang/ruby/gem-vars.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/gem-vars.mk 2017/05/30 14:26:08 1.6
+++ pkgsrc/lang/ruby/gem-vars.mk 2017/05/31 10:27:37 1.7
@@ -1,38 +1,41 @@ @@ -1,38 +1,41 @@
1# $NetBSD: gem-vars.mk,v 1.6 2017/05/30 14:26:08 taca Exp $ 1# $NetBSD: gem-vars.mk,v 1.7 2017/05/31 10:27:37 taca Exp $
2# 2#
3# This Makefile fragment defines various make(1) variables for Ruby gems 3# This Makefile fragment defines various make(1) variables for Ruby gems
4# support. 4# support.
5# 5#
6.if !defined(_RUBYGEM_VARS_MK) 6.if !defined(_RUBYGEM_VARS_MK)
7_RUBYGEM_VARS_MK= # defined 7_RUBYGEM_VARS_MK= # defined
8 8
9# Specify GEM_PATH 9# Specify GEM_PATH
10GEM_PATH?= ${PREFIX}/${GEM_HOME} 10GEM_PATH?= ${PREFIX}/${GEM_HOME}
11 11
12# Base directory for Gems 12# Base directory for Gems
13MAKE_ENV+= GEM_PATH=${GEM_PATH} 13MAKE_ENV+= GEM_PATH=${GEM_PATH}
14 14
15RUBYGEM_LANG?= en_US.UTF-8 15RUBYGEM_LANG?= en_US.UTF-8
16RUBYGEM_ENV?= LANG=${RUBYGEM_LANG} LC_CTYPE=${RUBYGEM_LANG} 16RUBYGEM_ENV?= LANG=${RUBYGEM_LANG} LC_CTYPE=${RUBYGEM_LANG}
17 17
18RUBYGEM= ${LOCALBASE}/bin/${RUBYGEM_NAME} 18RUBYGEM= ${LOCALBASE}/bin/${RUBYGEM_NAME}
19 19
20_RUBYGEMS_MAJOR= ${RUBY_GEMS_VERSION:C/\.[0-9\.]+$//} 20_RUBYGEMS_MAJOR= ${RUBY_GEMS_VERSION:C/\.[0-9\.]+$//}
21_RUBYGEMS_MINORS= ${RUBY_GEMS_VERSION:C/^([0-9]+)\.*//:C/\..*//} 21_RUBYGEMS_MINORS= ${RUBY_GEMS_VERSION:C/^([0-9]+)\.*//:C/\..*//}
22 22
23GEM_EXTSDIR_NEEDS_SUBDIR?= yes 23GEM_EXTSDIR_NEEDS_SUBDIR?= yes
 24
 25.if exists(${RUBYGEM})
24RUBY_GEM_ARCH!= ${RUBYGEM} environment platform | ${SED} -e 's|.*:||' 26RUBY_GEM_ARCH!= ${RUBYGEM} environment platform | ${SED} -e 's|.*:||'
25 27
26.if !empty(GEM_EXTSDIR_NEEDS_SUBDIR:M[nN][oO]) 28.if !empty(GEM_EXTSDIR_NEEDS_SUBDIR:M[nN][oO])
27GEM_EXTSDIR= ${GEM_HOME}/extensions/${RUBY_GEM_ARCH}/${RUBY_VER_DIR} 29GEM_EXTSDIR= ${GEM_HOME}/extensions/${RUBY_GEM_ARCH}/${RUBY_VER_DIR}
28.else 30.else
29GEM_EXTSDIR= ${GEM_HOME}/extensions/${RUBY_GEM_ARCH}/${RUBY_VER_DIR}/${GEM_NAME} 31GEM_EXTSDIR= ${GEM_HOME}/extensions/${RUBY_GEM_ARCH}/${RUBY_VER_DIR}/${GEM_NAME}
30.endif 32.endif
31 33
32.if !empty(GEM_EXTSDIR) 34.if !empty(GEM_EXTSDIR)
33PLIST_SUBST+= GEM_EXTSDIR=${GEM_EXTSDIR} 35PLIST_SUBST+= GEM_EXTSDIR=${GEM_EXTSDIR}
34.else 36.else
35PLIST_SUBST+= GEM_EXTSDIR="@comment " 37PLIST_SUBST+= GEM_EXTSDIR="@comment "
36.endif 38.endif
 39.endif
37 40
38.endif 41.endif