summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hartzell <hartzell@alerce.com>2018-01-26 18:51:38 -0800
committerAdam J. Stewart <ajstewart426@gmail.com>2018-01-26 20:51:38 -0600
commit970c7e8f454fdaaa5d8826b5d696c05208e5a233 (patch)
tree5e30e714ad50e3cad6a6cf5e876e08fd1d5f5ba5
parent1cd03e0f36618188b1a11808df689c58ea8a1422 (diff)
downloadspack-970c7e8f454fdaaa5d8826b5d696c05208e5a233.tar.gz
spack-970c7e8f454fdaaa5d8826b5d696c05208e5a233.tar.bz2
spack-970c7e8f454fdaaa5d8826b5d696c05208e5a233.tar.xz
spack-970c7e8f454fdaaa5d8826b5d696c05208e5a233.zip
Tell R's configure about tcltk config (#7085)
* Tell R's configure about tcltk config Add configure arguments that specify the location of the tcl and tk config scripts. Fixes #7072 * Flake8 cleanup
-rw-r--r--var/spack/repos/builtin/packages/r/package.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py
index 8235e8bd24..ebd83ec9a8 100644
--- a/var/spack/repos/builtin/packages/r/package.py
+++ b/var/spack/repos/builtin/packages/r/package.py
@@ -96,11 +96,16 @@ class R(AutotoolsPackage):
spec = self.spec
prefix = self.prefix
+ tclConfig_path = join_path(spec['tcl'].prefix.lib, 'tclConfig.sh')
+ tkConfig_path = join_path(spec['tk'].prefix.lib, 'tkConfig.sh')
+
config_args = [
'--libdir={0}'.format(join_path(prefix, 'rlib')),
'--enable-R-shlib',
'--enable-BLAS-shlib',
- '--enable-R-framework=no'
+ '--enable-R-framework=no',
+ '--with-tcl-config={0}'.format(tclConfig_path),
+ '--with-tk-config={0}'.format(tkConfig_path),
]
if '+external-lapack' in spec: