diff options
| author | joerg <joerg@pkgsrc.org> | 2010-09-28 20:24:25 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2010-09-28 20:24:25 +0000 |
| commit | c474dc85751976b3289d25494dc164a576dd3c86 (patch) | |
| tree | d5558fb4df42cfc7504702df14e82edec3ff4897 /mk | |
| parent | 03e6b2662417850ba850ce0b767c62e4a611ef66 (diff) | |
| download | pkgsrc-c474dc85751976b3289d25494dc164a576dd3c86.tar.gz | |
Add the necessary glue to hook Ruby into the multi-version framework.
This allows lang/ruby18 and lang/ruby19 to coexist in bulk builds.
Discussed with taca@
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/pbulk/pbulk-index.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mk/pbulk/pbulk-index.mk b/mk/pbulk/pbulk-index.mk index bc48d37a978..5fc6ecda1bc 100644 --- a/mk/pbulk/pbulk-index.mk +++ b/mk/pbulk/pbulk-index.mk @@ -1,4 +1,4 @@ -# $NetBSD: pbulk-index.mk,v 1.10 2010/06/15 19:23:55 joerg Exp $ +# $NetBSD: pbulk-index.mk,v 1.11 2010/09/28 20:24:25 joerg Exp $ # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to the parallel bulk build @@ -16,7 +16,7 @@ # _PBULK_MULTI_VAR.foo forces a specific version # _PBULK_MULTI_DEFAULT.foo contains the default value -_PBULK_MULTI?= apache php python +_PBULK_MULTI?= apache php python ruby _PBULK_MULTI_LIST.apache= PKG_APACHE_ACCEPTED _PBULK_MULTI_VAR.apache= PKG_APACHE @@ -30,6 +30,10 @@ _PBULK_MULTI_LIST.python= _PYTHON_VERSIONS_ACCEPTED _PBULK_MULTI_VAR.python= PYTHON_VERSION_REQD _PBULK_MULTI_DEFAULT.python= PYTHON_VERSION_DEFAULT +_PBULK_MULTI_LIST.ruby= RUBY_VERSION_SUPPORTED +_PBULK_MULTI_VAR.ruby= RUBY_VERSION_REQD +_PBULK_MULTI_DEFAULT.ruby= _RUBY_VERSION_DEFAULT + .PHONY: pbulk-index pbulk-index-item # Find all classes with more than one supported setting. @@ -104,4 +108,4 @@ pbulk-index-item: .endif pbulk-save-wrkdir: - ${RUN} cd ${WRKDIR} && ${TAR} cfz ${INTO:Q} . + ${RUN} [ ! -d ${WRKDIR} ] || cd ${WRKDIR} && tar cfz ${INTO:Q} . |