Skip to content

Commit

Permalink
tcl/tk is not always in lib folder, on gentoo it is in lib64, this co…
Browse files Browse the repository at this point in the history
…mmit tests it and picks the right one
  • Loading branch information
mboisson committed Jan 10, 2024
1 parent c68d093 commit 1a413d5
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions easybuild/easyblocks/r/r.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,11 @@ def configure_step(self):
for dep in ['Tcl', 'Tk']:
root = get_software_root(dep)
if root:
dep_config = os.path.join(root, 'lib', '%sConfig.sh' % dep.lower())
self.cfg.update('configopts', '--with-%s-config=%s' % (dep.lower(), dep_config))
for libdir in ['lib', 'lib64']:
dep_config = os.path.join(root, libdir, '%sConfig.sh' % dep.lower())
if os.path.exists(dep_config):
self.cfg.update('configopts', '--with-%s-config=%s' % (dep.lower(), dep_config))
break

if "--with-x=" not in self.cfg['configopts'].lower():
if get_software_root('X11'):
Expand Down

0 comments on commit 1a413d5

Please sign in to comment.