Merge branch 'spindle' into next

- Fixed conflicting changes to env/cc
- TODO: get rid of small hack in cc for machines with no CC

2 files changed, 48 insertions, 2 deletions

diff --git a/lib/spack/env/cc b/lib/spack/env/cc
index 97a8e6c42d..0711c873e3 100755
--- a/lib/spack/env/cc
+++ b/lib/spack/env/cc
@@ -28,11 +28,15 @@ spack_env_path   = get_path("SPACK_ENV_PATH")
 
 # Figure out what type of operation we're doing
 command = os.path.basename(sys.argv[0])
-cpp, cc, ccld, ld = range(4)
 
-# TODO: this can to be removed once Jira issue SPACK-16 is resolved
+cpp, cc, ccld, ld, version_check = range(5)
+
+########################################################################
+# TODO: this can to be removed once JIRA issue SPACK-16 is resolved
+#
 if command == 'CC':
     command = 'c++'
+########################################################################
 
 if command == 'cpp':
     mode = cpp
@@ -45,6 +49,9 @@ elif '-c' in sys.argv:
 else:
     mode = ccld
 
+if '-V' in sys.argv or '-v' in sys.argv or '--version' in sys.argv:
+    mode = version_check
+
 # Parse out the includes, libs, etc. so we can adjust them if need be.
 parser = argparse.ArgumentParser(add_help=False)
 parser.add_argument("-I", action='append', default=[], dest='include_path')
diff --git a/lib/spack/spack/packages/spindle.py b/lib/spack/spack/packages/spindle.py
new file mode 100644
index 0000000000..0d106221d8
--- /dev/null
+++ b/lib/spack/spack/packages/spindle.py
@@ -0,0 +1,39 @@
+##############################################################################
+# Copyright (c) 2014, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by Matthew LeGendre, legendre1@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://scalability-llnl.github.io/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (as published by
+# the Free Software Foundation) version 2.1 dated February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+class Spindle(Package):
+    homepage = "https://computation-rnd.llnl.gov/spindle"
+    url      = "https://github.com/hpc/Spindle/archive/v0.8.1.tar.gz"
+    list_url = "https://github.com/hpc/Spindle/releases"
+
+    versions = {'0.8.1' : 'f11793a6b9d8df2cd231fccb2857d912' }
+
+    depends_on("launchmon")
+
+    def install(self, spec, prefix):
+        configure("--prefix=" + prefix)
+        make()
+        make("install")