hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Alternative locations for tclConfig and tkConfig (#14071)

Browse source 
* Alternative locations for tclConfig and tkConfig

* Fix PEP-8
This commit is contained in:
iarspider 2019-12-10 22:18:19 +01:00 committed by Adam J. Stewart
parent 33f603734d
commit 5b3b522861
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
var/spack/repos/builtin/packages/r/package.py
View file

@ -109,6 +109,9 @@ def configure_args(self):
prefix = self.prefix prefix = self.prefix
tcl_config_path = join_path(spec['tcl'].prefix.lib, 'tclConfig.sh') tcl_config_path = join_path(spec['tcl'].prefix.lib, 'tclConfig.sh')
if not os.path.exists(tcl_config_path):
tcl_config_path = join_path(spec['tcl'].prefix,
'lib64', 'tclConfig.sh')
config_args = [ config_args = [
'--libdir={0}'.format(join_path(prefix, 'rlib')), '--libdir={0}'.format(join_path(prefix, 'rlib')),
@ -122,6 +125,9 @@ def configure_args(self):
] ]
if '^tk' in spec: if '^tk' in spec:
tk_config_path = join_path(spec['tk'].prefix.lib, 'tkConfig.sh') tk_config_path = join_path(spec['tk'].prefix.lib, 'tkConfig.sh')
if not os.path.exists(tk_config_path):
tk_config_path = join_path(spec['tk'].prefix,
'lib64', 'tkConfig.sh')
config_args.append('--with-tk-config={0}'.format(tk_config_path)) config_args.append('--with-tk-config={0}'.format(tk_config_path))
if '+external-lapack' in spec: if '+external-lapack' in spec: