From 5b3b52286195bae22b5dfb4af6b35b832bd684fd Mon Sep 17 00:00:00 2001 From: iarspider Date: Tue, 10 Dec 2019 22:18:19 +0100 Subject: [PATCH] Alternative locations for tclConfig and tkConfig (#14071) * Alternative locations for tclConfig and tkConfig * Fix PEP-8 --- var/spack/repos/builtin/packages/r/package.py | 6 ++++++ 1 file changed, 6 insertions(+) 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 @@ def configure_args(self): 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 @@ def configure_args(self): ] 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: