summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorGlenn Johnson <glenn-johnson@uiowa.edu>2016-05-29 16:06:03 -0500
committerGlenn Johnson <glenn-johnson@uiowa.edu>2016-06-16 23:08:54 -0500
commit8704a4ed35b5868a62cde613d85c3eeae27e5a5e (patch)
treeef4ab86710a87ce2efc2e2984991aebf78b7f14d /var
parentfe256870b47d8b0381c918e54a45c46229506bad (diff)
downloadspack-8704a4ed35b5868a62cde613d85c3eeae27e5a5e.tar.gz
spack-8704a4ed35b5868a62cde613d85c3eeae27e5a5e.tar.bz2
spack-8704a4ed35b5868a62cde613d85c3eeae27e5a5e.tar.xz
spack-8704a4ed35b5868a62cde613d85c3eeae27e5a5e.zip
Use configure_args rather than options
Replaced 'options' with 'configure_args'. That seems like a better name and is consistent with the packaging guide.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/R/package.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/R/package.py b/var/spack/repos/builtin/packages/R/package.py
index f4728bfd64..af520082ec 100644
--- a/var/spack/repos/builtin/packages/R/package.py
+++ b/var/spack/repos/builtin/packages/R/package.py
@@ -73,15 +73,15 @@ class R(Package):
def install(self, spec, prefix):
rlibdir = join_path(prefix, 'rlib')
- options = ['--prefix=%s' % prefix,
- '--libdir=%s' % rlibdir,
- '--enable-R-shlib',
- '--enable-BLAS-shlib',
- '--enable-R-framework=no']
+ configure_args = ['--prefix=%s' % prefix,
+ '--libdir=%s' % rlibdir,
+ '--enable-R-shlib',
+ '--enable-BLAS-shlib',
+ '--enable-R-framework=no']
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('install')
@@ -111,7 +111,7 @@ class R(Package):
extension_spec.prefix, self.r_lib_dir))
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:
R('CMD', 'INSTALL', '--library=%s' % self.module.r_lib_dir, '%s' %
self.stage.archive_file)"""