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

Tell R's configure about tcltk config (#7085)

Browse Source 
* 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
This commit is contained in:
George Hartzell 2018-01-26 18:51:38 -08:00 committed by Adam J. Stewart
parent 1cd03e0f36
commit 970c7e8f45
1 changed files with 6 additions and 1 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

@ -96,11 +96,16 @@ def configure_args(self):
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: