Merge pull request #715 from citibeth/efischer/160401-EnvironmentModules

Added Environment Modules

2 files changed, 38 insertions, 25 deletions

diff --git a/var/spack/repos/builtin/packages/environment-modules/package.py b/var/spack/repos/builtin/packages/environment-modules/package.py
new file mode 100644
index 0000000000..45181da41b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/environment-modules/package.py
@@ -0,0 +1,38 @@
+from spack import *
+
+
+class EnvironmentModules(Package):
+    """The Environment Modules package provides for the dynamic
+    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"
+
+    version('3.2.10', '8b097fdcb90c514d7540bb55a3cb90fb')
+
+    # Dependencies:
+    depends_on('tcl')
+
+    def install(self, spec, prefix):
+        tcl_spec = spec['tcl']
+
+        # See: https://sourceforge.net/p/modules/bugs/62/
+        CPPFLAGS = ['-DUSE_INTERP_ERRORLINE']
+        config_args = [
+            "--without-tclx",
+            "--with-tclx-ver=0.0",
+            "--prefix=%s" % prefix,
+            "--with-tcl=%s" % join_path(tcl_spec.prefix, 'lib'),    # It looks for tclConfig.sh
+            "--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)
+        ]
+
+
+        configure(*config_args)
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/modules/package.py b/var/spack/repos/builtin/packages/modules/package.py
deleted file mode 100644
index b014ee460c..0000000000
--- a/var/spack/repos/builtin/packages/modules/package.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from spack import *
-
-class Modules(Package):
-    """ The Environment Modules package provides for the dynamic modification of a user's environment via modulefiles. """
-
-    homepage = "http://modules.sf.net"
-    url      = "http://downloads.sourceforge.net/project/modules/Modules/modules-3.2.10/modules-3.2.10.tar.gz"
-
-    version('3.2.10', '8b097fdcb90c514d7540bb55a3cb90fb')
-
-    depends_on("tcl")
-
-    def install(self, spec, prefix):
-
-	options = ['--prefix=%s' % prefix, 
-                   '--disable-debug',
-                   '--disable-dependency-tracking',
-                   '--disable-silent-rules',
-                   '--disable-versioning', 
-                   '--datarootdir=%s' % prefix.share,
-                   'CPPFLAGS=-DUSE_INTERP_ERRORLINE']
-
-        configure(*options)
-        make()
-        make("install")