From 4457c6a2ad436f666dfc1ef8135b8a355e81ceef Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Tue, 8 Nov 2016 16:19:31 +0100 Subject: Updated environment-modules package: (#2279) Added 'lib64' directory as a possible option where tclConfig.sh file can be found. --- .../packages/environment-modules/package.py | 33 ++++++++++++++++------ 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/environment-modules/package.py b/var/spack/repos/builtin/packages/environment-modules/package.py index 85594bab47..335fa1a3fe 100644 --- a/var/spack/repos/builtin/packages/environment-modules/package.py +++ b/var/spack/repos/builtin/packages/environment-modules/package.py @@ -23,6 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import os class EnvironmentModules(Package): @@ -30,7 +31,7 @@ class EnvironmentModules(Package): modification of a user's environment via modulefiles.""" homepage = "https://sourceforge.net/p/modules/wiki/Home/" - url = "http://prdownloads.sourceforge.net/modules/modules-3.2.10.tar.gz" + url = "http://prdownloads.sourceforge.net/modules/modules-3.2.10.tar.gz" version('3.2.10', '8b097fdcb90c514d7540bb55a3cb90fb') @@ -40,22 +41,38 @@ class EnvironmentModules(Package): def install(self, spec, prefix): tcl_spec = spec['tcl'] + # We are looking for tclConfig.sh + tcl_config_name = 'tclConfig.sh' + tcl_config_dir_options = [tcl_spec.prefix.lib, + tcl_spec.prefix.lib64] + + tcl_config_found = False + for tcl_config_dir in tcl_config_dir_options: + tcl_config_found = os.path.exists( + join_path(tcl_config_dir, tcl_config_name)) + if tcl_config_found: + break + + if not tcl_config_found: + raise InstallError('Failed to locate ' + tcl_config_name) + # See: https://sourceforge.net/p/modules/bugs/62/ - CPPFLAGS = ['-DUSE_INTERP_ERRORLINE'] + cpp_flags = ['-DUSE_INTERP_ERRORLINE'] + config_args = [ "--without-tclx", "--with-tclx-ver=0.0", - "--prefix=%s" % prefix, + "--prefix=" + prefix, # It looks for tclConfig.sh - "--with-tcl=%s" % join_path(tcl_spec.prefix, 'lib'), - "--with-tcl-ver=%d.%d" % (tcl_spec.version.version[ - 0], tcl_spec.version.version[1]), + "--with-tcl=" + tcl_config_dir, + "--with-tcl-ver=%d.%d" % ( + tcl_spec.version.version[0], tcl_spec.version.version[1]), '--disable-debug', '--disable-dependency-tracking', '--disable-silent-rules', '--disable-versioning', - '--datarootdir=%s' % prefix.share, - 'CPPFLAGS=%s' % ' '.join(CPPFLAGS) + '--datarootdir=' + prefix.share, + 'CPPFLAGS=' + ' '.join(cpp_flags) ] configure(*config_args) -- cgit v1.2.3-60-g2f50