summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriarspider <iarspider@gmail.com>2019-12-10 22:18:19 +0100
committerAdam J. Stewart <ajstewart426@gmail.com>2019-12-10 15:18:19 -0600
commit5b3b52286195bae22b5dfb4af6b35b832bd684fd (patch)
treef6278e109a0b71ae5d92c790d8535a7e9d3b2d49
parent33f603734d165768db7a83331144e2bcea80bf86 (diff)
downloadspack-5b3b52286195bae22b5dfb4af6b35b832bd684fd.tar.gz
spack-5b3b52286195bae22b5dfb4af6b35b832bd684fd.tar.bz2
spack-5b3b52286195bae22b5dfb4af6b35b832bd684fd.tar.xz
spack-5b3b52286195bae22b5dfb4af6b35b832bd684fd.zip
Alternative locations for tclConfig and tkConfig (#14071)
* Alternative locations for tclConfig and tkConfig * Fix PEP-8
-rw-r--r--var/spack/repos/builtin/packages/r/package.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py
index e9897ffa28..7ef3e70682 100644
--- a/var/spack/repos/builtin/packages/r/package.py
+++ b/var/spack/repos/builtin/packages/r/package.py
@@ -109,6 +109,9 @@ class R(AutotoolsPackage):
prefix = self.prefix
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 = [
'--libdir={0}'.format(join_path(prefix, 'rlib')),
@@ -122,6 +125,9 @@ class R(AutotoolsPackage):
]
if '^tk' in spec:
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))
if '+external-lapack' in spec: