From 78abdcea16948eb1a792dc9b672871a04cac8e93 Mon Sep 17 00:00:00 2001
From: Matthew LeGendre <legendre1@llnl.gov>
Date: Thu, 13 Mar 2014 14:14:31 -0700
Subject: add spindle package

---
 lib/spack/spack/packages/spindle.py | 39 +++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 lib/spack/spack/packages/spindle.py

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")
-- 
cgit v1.2.3-60-g2f50


From 008d7a316216ab086aa8954854a125c66f094d46 Mon Sep 17 00:00:00 2001
From: Matthew LeGendre <legendre1@llnl.gov>
Date: Thu, 13 Mar 2014 17:04:02 -0700
Subject: Change spindle package to use hardcoded LaunchMON path

---
 lib/spack/spack/packages/spindle.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/spack/spack/packages/spindle.py b/lib/spack/spack/packages/spindle.py
index 0d106221d8..3341ad7e05 100644
--- a/lib/spack/spack/packages/spindle.py
+++ b/lib/spack/spack/packages/spindle.py
@@ -31,9 +31,9 @@ class Spindle(Package):
 
     versions = {'0.8.1' : 'f11793a6b9d8df2cd231fccb2857d912' }
 
-    depends_on("launchmon")
+#    depends_on("launchmon")
 
     def install(self, spec, prefix):
-        configure("--prefix=" + prefix)
+        configure("--prefix=" + prefix + " --with-launchmon=/collab/usr/global/tools/launchmon/chaos_5_x86_64_ib/launchmon-1.0.0-20140312")
         make()
         make("install")
-- 
cgit v1.2.3-60-g2f50


From 40cda9fa9cb1fe89f85ccd7cd56f0d98e403c5bf Mon Sep 17 00:00:00 2001
From: Matthew LeGendre <legendre1@llnl.gov>
Date: Fri, 14 Mar 2014 11:22:09 -0700
Subject: Fix issue when compiler wrappers ran gcc -V

---
 lib/spack/env/cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/spack/env/cc b/lib/spack/env/cc
index 0245e06531..47a5bcf900 100755
--- a/lib/spack/env/cc
+++ b/lib/spack/env/cc
@@ -28,7 +28,7 @@ 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)
+cpp, cc, ccld, ld, version_check = range(5)
 if command == 'cpp':
     mode = cpp
 elif command == 'ld':
@@ -40,6 +40,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')
-- 
cgit v1.2.3-60-g2f50


From cfbf348982e4af9c506afc24f91e0db6eb655410 Mon Sep 17 00:00:00 2001
From: Matthew LeGendre <legendre1@llnl.gov>
Date: Fri, 14 Mar 2014 12:04:18 -0700
Subject: Fix spindle launchmon dependency

---
 lib/spack/spack/packages/spindle.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/spack/spack/packages/spindle.py b/lib/spack/spack/packages/spindle.py
index 3341ad7e05..0d106221d8 100644
--- a/lib/spack/spack/packages/spindle.py
+++ b/lib/spack/spack/packages/spindle.py
@@ -31,9 +31,9 @@ class Spindle(Package):
 
     versions = {'0.8.1' : 'f11793a6b9d8df2cd231fccb2857d912' }
 
-#    depends_on("launchmon")
+    depends_on("launchmon")
 
     def install(self, spec, prefix):
-        configure("--prefix=" + prefix + " --with-launchmon=/collab/usr/global/tools/launchmon/chaos_5_x86_64_ib/launchmon-1.0.0-20140312")
+        configure("--prefix=" + prefix)
         make()
         make("install")
-- 
cgit v1.2.3-60-g2f50