From 74ec74d73ceea04afdda5cdde1b935713672fe2e Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Sat, 15 Mar 2014 19:46:41 -0700
Subject: [PATCH] Integrate & clean up packages from LLNL hackathon.
---
lib/spack/spack/cmd/mirror.py | 3 +++
lib/spack/spack/globals.py | 2 +-
lib/spack/spack/packages/mrnet.py | 5 ++--
lib/spack/spack/packages/pmgr_collective.py | 1 -
lib/spack/spack/packages/stat.py | 27 ++++++++++++---------
5 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/lib/spack/spack/cmd/mirror.py b/lib/spack/spack/cmd/mirror.py
index 098b1c3bf8..91fe38fe67 100644
--- a/lib/spack/spack/cmd/mirror.py
+++ b/lib/spack/spack/cmd/mirror.py
@@ -84,6 +84,9 @@ def mirror(parser, args):
shutil.move(stage.archive_file, final_dst)
tty.msg("Added %s to mirror" % final_dst)
+ except Exception, e:
+ tty.warn("Error while fetching %s. Skipping." % url, e.message)
+
finally:
stage.destroy()
diff --git a/lib/spack/spack/globals.py b/lib/spack/spack/globals.py
index 990a2ff417..2cf2761362 100644
--- a/lib/spack/spack/globals.py
+++ b/lib/spack/spack/globals.py
@@ -117,7 +117,7 @@
# For no mirrors:
# mirrors = []
#
-mirrors = ['file:///Users/gamblin2/mirror']
+mirrors = []
# Important environment variables
SPACK_NO_PARALLEL_MAKE = 'SPACK_NO_PARALLEL_MAKE'
diff --git a/lib/spack/spack/packages/mrnet.py b/lib/spack/spack/packages/mrnet.py
index 0fcbe68ee3..15d851f83e 100644
--- a/lib/spack/spack/packages/mrnet.py
+++ b/lib/spack/spack/packages/mrnet.py
@@ -6,9 +6,10 @@ class Mrnet(Package):
url = "ftp://ftp.cs.wisc.edu/paradyn/mrnet/mrnet_4.0.0.tar.gz"
versions = { '4.0.0' : 'd00301c078cba57ef68613be32ceea2f', }
+ parallel = False
def install(self, spec, prefix):
configure("--prefix=%s" %prefix, "--enable-shared")
- make(parallel=False)
- make("install", parallel=False)
+ make()
+ make("install")
diff --git a/lib/spack/spack/packages/pmgr_collective.py b/lib/spack/spack/packages/pmgr_collective.py
index a7e1130436..0874e2d17b 100644
--- a/lib/spack/spack/packages/pmgr_collective.py
+++ b/lib/spack/spack/packages/pmgr_collective.py
@@ -29,7 +29,6 @@ class PmgrCollective(Package):
MPI jobs."""
homepage = "http://www.sourceforge.net/projects/pmgrcollective"
url = "http://downloads.sourceforge.net/project/pmgrcollective/pmgrcollective/PMGR_COLLECTIVE-1.0/pmgr_collective-1.0.tgz"
-# url = "http://downloads.sourceforge.net/project/pmgrcollective/pmgrcollective/PMGR_COLLECTIVE-1.0/pmgr_collective-1.0.tgz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fpmgrcollective%2F%3Fsource%3Ddlp&ts=1394747864&use_mirror=iweb
versions = { '1.0' : '0384d008774274cc3fc7b4d810dfd07e' }
diff --git a/lib/spack/spack/packages/stat.py b/lib/spack/spack/packages/stat.py
index 8d9d9f406a..d621bcef01 100644
--- a/lib/spack/spack/packages/stat.py
+++ b/lib/spack/spack/packages/stat.py
@@ -14,21 +14,26 @@ class Stat(Package):
depends_on('mrnet')
def install(self, spec, prefix):
- my_mrnet = spec['mrnet']
- my_graphlib = spec['graphlib']
- #my_launchmon = spec['launchmon']
- my_dyninst = spec['dyninst']
- my_libdwarf = spec['libdwarf']
+ configure(
+ "--enable-gui",
+ "--prefix=%s" % prefix,
- # TODO: this uses the launchmon package, but path is too long (see depends_on above) (Jira SPACK-21)
- #configure("--enable-gui", "--prefix=%s" %prefix, "--with-launchmon=%s" %my_launchmon.prefix, "--with-mrnet=%s" %my_mrnet.prefix, "--with-graphlib=%s" %my_graphlib.prefix, "--with-stackwalker=%s" %my_dyninst.prefix, "--with-libdwarf=%s" %my_libdwarf.prefix)
+ # TODO: this uses the launchmon package, but path is
+ # too long (see depends_on above) (Jira SPACK-21)
+ # "--with-launchmon=%s" % spec['launchmon'].prefix,
- # TODO: the configure line above is the proper one once Jira SPACK-21 is fixed
- configure("--enable-gui", "--prefix=%s" %prefix, "--with-launchmon=/collab/usr/global/tools/launchmon/chaos_5_x86_64_ib/launchmon-1.0.0-20140312", "--with-mrnet=%s" %my_mrnet.prefix, "--with-graphlib=%s" %my_graphlib.prefix, "--with-stackwalker=%s" %my_dyninst.prefix, "--with-libdwarf=%s" %my_libdwarf.prefix)
+ # TODO: launchmon line above is the proper one once
+ # SPACK-21 is fixed
+ "--with-launchmon=/collab/usr/global/tools/launchmon/chaos_5_x86_64_ib/launchmon-1.0.0-20140312",
- # TODO: remove once Jira SPACK-19 is fixed
+ "--with-mrnet=%s" % spec['mrnet'].prefix,
+ "--with-graphlib=%s" % spec['graphlib'].prefix,
+ "--with-stackwalker=%s" % spec['dyninst'].prefix,
+ "--with-libdwarf=%s" % spec['libdwarf'].prefix)
+
+ # TODO: remove once SPACK-19 is fixed
import shutil
shutil.copy2('/usr/bin/libtool', 'libtool')
-
+
make(parallel=False)
make("install")
--
GitLab