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

This commit explicitly sets libdir. This is necessary because different

Browse Source 
systems use different defaults.
This commit is contained in:
Glenn Johnson 2016-04-23 12:30:34 -05:00
parent 8a7f34665b
commit 62d175c984
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,9 +50,12 @@ class R(Package):
depends_on('tk') depends_on('tk')
def install(self, spec, prefix): def install(self, spec, prefix):
rlibdir = join_path(prefix, 'rlib')
options = ['--prefix=%s' % prefix, options = ['--prefix=%s' % prefix,
'--libdir=%s' % rlibdir,
'--enable-R-shlib', '--enable-R-shlib',
'--enable-BLAS-shlib'] '--enable-BLAS-shlib',
'--enable-R-framework=no']
if '+external-lapack' in spec: if '+external-lapack' in spec:
options.extend(['--with-blas', '--with-lapack']) options.extend(['--with-blas', '--with-lapack'])
@ -66,7 +69,7 @@ def install(self, spec, prefix):
@property @property
def r_lib_dir(self): def r_lib_dir(self):
return os.path.join('lib64', 'R', 'library') return os.path.join('rlib', 'R', 'library')
def setup_dependent_environment(self, spack_env, run_env, extension_spec): def setup_dependent_environment(self, spack_env, run_env, extension_spec):
# Set R_LIBS to include the library dir for the # Set R_LIBS to include the library dir for the