zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use configure_args rather than options

Browse Source 
Replaced 'options' with 'configure_args'. That seems like a better name
and is consistent with the packaging guide.
This commit is contained in:
Glenn Johnson 2016-05-29 16:06:03 -05:00
parent fe256870b4
commit 8704a4ed35
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
var/spack/repos/builtin/packages/R/package.py
View File

@ -73,15 +73,15 @@ class R(Package):
def install(self, spec, prefix): def install(self, spec, prefix):
rlibdir = join_path(prefix, 'rlib') rlibdir = join_path(prefix, 'rlib')
options = ['--prefix=%s' % prefix, configure_args = ['--prefix=%s' % prefix,
'--libdir=%s' % rlibdir, '--libdir=%s' % rlibdir,
'--enable-R-shlib', '--enable-R-shlib',
'--enable-BLAS-shlib', '--enable-BLAS-shlib',
'--enable-R-framework=no'] '--enable-R-framework=no']
if '+external-lapack' in spec: if '+external-lapack' in spec:
options.extend(['--with-blas', '--with-lapack']) configure_args.extend(['--with-blas', '--with-lapack'])
configure(*options) configure(*configure_args)
make() make()
make('install') make('install')
@ -111,7 +111,7 @@ def setup_dependent_environment(self, spack_env, run_env, extension_spec):
extension_spec.prefix, self.r_lib_dir)) extension_spec.prefix, self.r_lib_dir))
def setup_dependent_package(self, module, ext_spec): def setup_dependent_package(self, module, ext_spec):
"""Called before R modules' install() methods. In most cases, """Called before R modules' install() methods. In most cases,
extensions will only need to have one line: extensions will only need to have one line:
R('CMD', 'INSTALL', '--library=%s' % self.module.r_lib_dir, '%s' % R('CMD', 'INSTALL', '--library=%s' % self.module.r_lib_dir, '%s' %
self.stage.archive_file)""" self.stage.archive_file)"""