diff options
| author | Glenn Johnson <glennpj@gmail.com> | 2016-04-23 12:30:34 -0500 |
|---|---|---|
| committer | Glenn Johnson <glennpj@gmail.com> | 2016-04-23 12:30:34 -0500 |
| commit | 62d175c984c5413fd95185d7bb3280bad69e1e33 (patch) | |
| tree | 78246bc5daf8a44a4af3435d572129c23d7f3887 | |
| parent | 8a7f34665b0b8b95f273401082d862989bb4443c (diff) | |
| download | spack-62d175c984c5413fd95185d7bb3280bad69e1e33.tar.gz spack-62d175c984c5413fd95185d7bb3280bad69e1e33.tar.bz2 spack-62d175c984c5413fd95185d7bb3280bad69e1e33.tar.xz spack-62d175c984c5413fd95185d7bb3280bad69e1e33.zip | |
This commit explicitly sets `libdir`. This is necessary because different
systems use different defaults.
| -rw-r--r-- | var/spack/repos/builtin/packages/R/package.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/R/package.py b/var/spack/repos/builtin/packages/R/package.py index 3a76416f27..7c4aa3520c 100644 --- a/var/spack/repos/builtin/packages/R/package.py +++ b/var/spack/repos/builtin/packages/R/package.py @@ -50,9 +50,12 @@ class R(Package): depends_on('tk') def install(self, spec, prefix): + rlibdir = join_path(prefix, 'rlib') options = ['--prefix=%s' % prefix, + '--libdir=%s' % rlibdir, '--enable-R-shlib', - '--enable-BLAS-shlib'] + '--enable-BLAS-shlib', + '--enable-R-framework=no'] if '+external-lapack' in spec: options.extend(['--with-blas', '--with-lapack']) @@ -66,7 +69,7 @@ class R(Package): @property 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): # Set R_LIBS to include the library dir for the |