From d1de958daac3991bf673c4e5b10a0564a9a610d8 Mon Sep 17 00:00:00 2001 From: Matthew LeGendre Date: Fri, 1 Aug 2014 15:48:59 -0700 Subject: Add libmonitor to spack. Still needs svn support for checkout --- var/spack/packages/libmonitor/package.py | 36 ++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 var/spack/packages/libmonitor/package.py (limited to 'var') diff --git a/var/spack/packages/libmonitor/package.py b/var/spack/packages/libmonitor/package.py new file mode 100644 index 0000000000..ac84f2e9ac --- /dev/null +++ b/var/spack/packages/libmonitor/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Written by Todd Gamblin, tgamblin@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 Libmonitor(Package): + homepage = "http://hpctoolkit.org" + url = "file:///g/g0/legendre/tools/oss/openspeedshop-release-2.1/SOURCES/libmonitor-20130218.tar.gz" + + version('20130218', 'aa85c2c580e2dafb823cc47b09374279') + + def install(self, spec, prefix): + configure("--prefix=" + prefix) + make() + make("install") -- cgit v1.2.3-70-g09d2 From b7fbc77babea727ee7620c8dbe48fd91ac953ff2 Mon Sep 17 00:00:00 2001 From: Matthew LeGendre Date: Fri, 1 Aug 2014 15:50:43 -0700 Subject: Add sqlite to spack --- var/spack/packages/sqlite/package.py | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 var/spack/packages/sqlite/package.py (limited to 'var') diff --git a/var/spack/packages/sqlite/package.py b/var/spack/packages/sqlite/package.py new file mode 100644 index 0000000000..19013fb324 --- /dev/null +++ b/var/spack/packages/sqlite/package.py @@ -0,0 +1,35 @@ +############################################################################## +# Copyright (c) 2013, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Written by Todd Gamblin, tgamblin@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 Sqlite(Package): + homepage = "www.sqlite.org" + + version('3.8.5', '0544ef6d7afd8ca797935ccc2685a9ed', url='http://www.sqlite.org/2014/sqlite-autoconf-3080500.tar.gz') + + def install(self, spec, prefix): + configure("--prefix=" + prefix) + make() + make("install") -- cgit v1.2.3-70-g09d2 From d7a3c7e555bfd93fbf93ec55608d7fc6aa8052f8 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Sun, 3 Aug 2014 12:57:09 -0700 Subject: Fix up Matt's openss packages. --- lib/spack/spack/cmd/info.py | 10 ++++++---- var/spack/packages/libmonitor/package.py | 1 + var/spack/packages/sqlite/package.py | 7 ++++++- 3 files changed, 13 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/lib/spack/spack/cmd/info.py b/lib/spack/spack/cmd/info.py index 648dbf905a..bb147b30f5 100644 --- a/lib/spack/spack/cmd/info.py +++ b/lib/spack/spack/cmd/info.py @@ -37,15 +37,17 @@ def info(parser, args): package = spack.db.get(args.name) print "Package: ", package.name print "Homepage: ", package.homepage - print "Download: ", package.url print print "Safe versions: " - if package.versions: - colify(reversed(sorted(package.versions)), indent=4) + if not package.versions: + print("None.") else: - print "None. Use spack versions %s to get a list of downloadable versions." % package.name + maxlen = max(len(str(v)) for v in package.versions) + fmt = "%%-%ss" % maxlen + for v in reversed(sorted(package.versions)): + print " " + (fmt % v) + " " + package.url_for_version(v) print print "Dependencies:" diff --git a/var/spack/packages/libmonitor/package.py b/var/spack/packages/libmonitor/package.py index ac84f2e9ac..210712436a 100644 --- a/var/spack/packages/libmonitor/package.py +++ b/var/spack/packages/libmonitor/package.py @@ -25,6 +25,7 @@ from spack import * class Libmonitor(Package): + """Libmonitor is a library for process and thread control.""" homepage = "http://hpctoolkit.org" url = "file:///g/g0/legendre/tools/oss/openspeedshop-release-2.1/SOURCES/libmonitor-20130218.tar.gz" diff --git a/var/spack/packages/sqlite/package.py b/var/spack/packages/sqlite/package.py index 19013fb324..734b0b6cb6 100644 --- a/var/spack/packages/sqlite/package.py +++ b/var/spack/packages/sqlite/package.py @@ -25,9 +25,14 @@ from spack import * class Sqlite(Package): + """SQLite3 is an SQL database engine in a C library. Programs that + link the SQLite3 library can have SQL database access without + running a separate RDBMS process. + """ homepage = "www.sqlite.org" - version('3.8.5', '0544ef6d7afd8ca797935ccc2685a9ed', url='http://www.sqlite.org/2014/sqlite-autoconf-3080500.tar.gz') + version('3.8.5', '0544ef6d7afd8ca797935ccc2685a9ed', + url='http://www.sqlite.org/2014/sqlite-autoconf-3080500.tar.gz') def install(self, spec, prefix): configure("--prefix=" + prefix) -- cgit v1.2.3-70-g09d2 From 0740c576a714281b0449e33f1b8e4b00e5d9d9c0 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Thu, 10 Jul 2014 15:54:10 -0700 Subject: Package for postgresql. --- var/spack/packages/postgresql/package.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 var/spack/packages/postgresql/package.py (limited to 'var') diff --git a/var/spack/packages/postgresql/package.py b/var/spack/packages/postgresql/package.py new file mode 100644 index 0000000000..bf14c3b922 --- /dev/null +++ b/var/spack/packages/postgresql/package.py @@ -0,0 +1,24 @@ +from spack import * + +class Postgresql(Package): + """PostgreSQL is a powerful, open source object-relational + database system. It has more than 15 years of active + development and a proven architecture that has earned it a + strong reputation for reliability, data integrity, and + correctness.""" + homepage = "http://www.postgresql.org/" + url = "http://ftp.postgresql.org/pub/source/v9.3.4/postgresql-9.3.4.tar.bz2" + + version('9.3.4', 'd0a41f54c377b2d2fab4a003b0dac762') + + def install(self, spec, prefix): + # FIXME: Modify the configure line to suit your build system here. + configure("--prefix=%s" % prefix) + + # FIXME: Add logic to build and install here + make() + make("install") + + + def dotkit(self, dk): + dk.setenv('PGDATA', "%s/data" %self.prefix) -- cgit v1.2.3-70-g09d2 From 0b68d1292d9b415b74abc63e909c44399ae9a97a Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Fri, 25 Jul 2014 20:07:05 -0700 Subject: Add package for openssl, have postgres use it. - Updated version wildcard to include [a-z]|alpha|beta to accommodate all the letter suffixes on openssl. --- var/spack/packages/openssl/package.py | 26 ++++++++++++++++++++++++++ var/spack/packages/postgresql/package.py | 8 ++++---- 2 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 var/spack/packages/openssl/package.py (limited to 'var') diff --git a/var/spack/packages/openssl/package.py b/var/spack/packages/openssl/package.py new file mode 100644 index 0000000000..c5a8aeb9dc --- /dev/null +++ b/var/spack/packages/openssl/package.py @@ -0,0 +1,26 @@ +from spack import * + +class Openssl(Package): + """The OpenSSL Project is a collaborative effort to develop a + robust, commercial-grade, full-featured, and Open Source + toolkit implementing the Secure Sockets Layer (SSL v2/v3) and + Transport Layer Security (TLS v1) protocols as well as a + full-strength general purpose cryptography library.""" + homepage = "http://www.openssl.org" + url = "http://www.openssl.org/source/openssl-1.0.1h.tar.gz" + + version('1.0.1h', '8d6d684a9430d5cc98a62a5d8fbda8cf') + + depends_on("zlib") + parallel = False + + def install(self, spec, prefix): + config = Executable("./config") + config("--prefix=%s" % prefix, + "--openssldir=%s/etc/openssl" % prefix, + "zlib", + "no-krb5", + "shared") + + make() + make("install") diff --git a/var/spack/packages/postgresql/package.py b/var/spack/packages/postgresql/package.py index bf14c3b922..a93f87df80 100644 --- a/var/spack/packages/postgresql/package.py +++ b/var/spack/packages/postgresql/package.py @@ -11,11 +11,11 @@ class Postgresql(Package): version('9.3.4', 'd0a41f54c377b2d2fab4a003b0dac762') - def install(self, spec, prefix): - # FIXME: Modify the configure line to suit your build system here. - configure("--prefix=%s" % prefix) + depends_on("openssl") - # FIXME: Add logic to build and install here + def install(self, spec, prefix): + configure("--prefix=%s" % prefix, + "--with-openssl") make() make("install") -- cgit v1.2.3-70-g09d2 From 90cd0c7efa9cc6b1e58530bede25deeaaaf9f52e Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Thu, 31 Jul 2014 13:26:55 -0700 Subject: Add Kevin's experimental TAU version --- var/spack/packages/tau/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/packages/tau/package.py b/var/spack/packages/tau/package.py index 8d9dbe1759..33320622db 100644 --- a/var/spack/packages/tau/package.py +++ b/var/spack/packages/tau/package.py @@ -11,7 +11,8 @@ class Tau(Package): url = "http://www.cs.uoregon.edu/research/paracomp/tau/tauprofile/dist/tau-2.23.1.tar.gz" version('2.23.1', '6593b47ae1e7a838e632652f0426fe72') - + version('2.23-perfdb', 'c97b404bcd94c7d9b04fa3dc0a32b0d1', + url='http://www.nic.uoregon.edu/~khuck/tau2-latest.tar.gz') def install(self, spec, prefix): # TAU isn't happy with directories that have '@' in the path. Sigh. -- cgit v1.2.3-70-g09d2 From 6127b0baa69fa469cf9a02dcd5dc78f674b746b3 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Wed, 6 Aug 2014 21:58:59 -0700 Subject: new prototype TAU tarball from Kevin --- var/spack/packages/tau/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/packages/tau/package.py b/var/spack/packages/tau/package.py index 33320622db..e58acfb41a 100644 --- a/var/spack/packages/tau/package.py +++ b/var/spack/packages/tau/package.py @@ -10,8 +10,8 @@ class Tau(Package): homepage = "http://www.cs.uoregon.edu/research/tau" url = "http://www.cs.uoregon.edu/research/paracomp/tau/tauprofile/dist/tau-2.23.1.tar.gz" - version('2.23.1', '6593b47ae1e7a838e632652f0426fe72') - version('2.23-perfdb', 'c97b404bcd94c7d9b04fa3dc0a32b0d1', + version('2.23.1', '6593b47ae1e7a838e632652f0426fe72') + version('2.23.2-perfdb', 'f743a65951220f5b46b9d3cf179129d0', url='http://www.nic.uoregon.edu/~khuck/tau2-latest.tar.gz') def install(self, spec, prefix): -- cgit v1.2.3-70-g09d2 From fa3b19000db9ed6f3d6cf31895aeee4ac0d4e633 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Mon, 11 Aug 2014 22:47:13 -0700 Subject: update tau tarball --- var/spack/packages/tau/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/packages/tau/package.py b/var/spack/packages/tau/package.py index e58acfb41a..caafe4e2c9 100644 --- a/var/spack/packages/tau/package.py +++ b/var/spack/packages/tau/package.py @@ -11,7 +11,7 @@ class Tau(Package): url = "http://www.cs.uoregon.edu/research/paracomp/tau/tauprofile/dist/tau-2.23.1.tar.gz" version('2.23.1', '6593b47ae1e7a838e632652f0426fe72') - version('2.23.2-perfdb', 'f743a65951220f5b46b9d3cf179129d0', + version('2.23.2-perfdb', '4048f693eee246d48eb2619c0f05999e', url='http://www.nic.uoregon.edu/~khuck/tau2-latest.tar.gz') def install(self, spec, prefix): -- cgit v1.2.3-70-g09d2 From e301d623329d3f484316643c6a50dc3df4806dab Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Wed, 20 Aug 2014 11:46:59 -0700 Subject: Remove development TAU version from package. --- var/spack/packages/tau/package.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/packages/tau/package.py b/var/spack/packages/tau/package.py index caafe4e2c9..048fac80aa 100644 --- a/var/spack/packages/tau/package.py +++ b/var/spack/packages/tau/package.py @@ -10,9 +10,7 @@ class Tau(Package): homepage = "http://www.cs.uoregon.edu/research/tau" url = "http://www.cs.uoregon.edu/research/paracomp/tau/tauprofile/dist/tau-2.23.1.tar.gz" - version('2.23.1', '6593b47ae1e7a838e632652f0426fe72') - version('2.23.2-perfdb', '4048f693eee246d48eb2619c0f05999e', - url='http://www.nic.uoregon.edu/~khuck/tau2-latest.tar.gz') + version('2.23.1', '6593b47ae1e7a838e632652f0426fe72') def install(self, spec, prefix): # TAU isn't happy with directories that have '@' in the path. Sigh. -- cgit v1.2.3-70-g09d2 From ec44791aa3b5583036f469137412fd40caf11b24 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Fri, 5 Sep 2014 10:52:43 -0700 Subject: Remove examples from default STAT build to avoid MPI dependence. --- var/spack/packages/stat/package.py | 1 + 1 file changed, 1 insertion(+) (limited to 'var') diff --git a/var/spack/packages/stat/package.py b/var/spack/packages/stat/package.py index 583ae48e82..956b0dcc8c 100644 --- a/var/spack/packages/stat/package.py +++ b/var/spack/packages/stat/package.py @@ -20,6 +20,7 @@ class Stat(Package): configure( "--enable-gui", "--prefix=%s" % prefix, + "--disable-examples", # Examples require MPI: avoid this dependency. "--with-launchmon=%s" % spec['launchmon'].prefix, "--with-mrnet=%s" % spec['mrnet'].prefix, "--with-graphlib=%s" % spec['graphlib'].prefix, -- cgit v1.2.3-70-g09d2 From 656cf12cdac9bbfdcb583b29eb5d287c430ef6d6 Mon Sep 17 00:00:00 2001 From: Adam Moody Date: Tue, 16 Sep 2014 16:50:54 -0700 Subject: add adeptutils and callpath packages --- var/spack/packages/adeptutils/package.py | 40 ++++++++++++++++++++++++++++++++ var/spack/packages/callpath/package.py | 12 +++++++--- 2 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 var/spack/packages/adeptutils/package.py (limited to 'var') diff --git a/var/spack/packages/adeptutils/package.py b/var/spack/packages/adeptutils/package.py new file mode 100644 index 0000000000..41bf7882db --- /dev/null +++ b/var/spack/packages/adeptutils/package.py @@ -0,0 +1,40 @@ +############################################################################## +# Copyright (c) 2013, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Written by Todd Gamblin, tgamblin@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 Adeptutils(Package): + """LLNL Utility Libraries""" + + homepage = "https://github.com/scalability-llnl/adept-utils" + url = "https://github.com/scalability-llnl/adept-utils/archive/v1.0.tar.gz" + + version('1.0', '5c6cd9badce56c945ac8551e34804397') + + depends_on("mpi") + + def install(self, spec, prefix): + cmake("-DCMAKE_INSTALL_PREFIX=" + prefix) + make() + make("install") diff --git a/var/spack/packages/callpath/package.py b/var/spack/packages/callpath/package.py index 5d92d77302..3cbfc26060 100644 --- a/var/spack/packages/callpath/package.py +++ b/var/spack/packages/callpath/package.py @@ -25,13 +25,19 @@ from spack import * class Callpath(Package): - homepage = "https://github.com/tgamblin/callpath" - url = "http://github.com/tgamblin/callpath-0.2.tar.gz" + """Library for representing callpaths consistently in distributed-memory performance tools.""" + + homepage = "https://github.com/scalability-llnl/callpath" + url = "https://github.com/scalability-llnl/callpath/archive/v1.0.1.tar.gz" + + version('1.0.1', '0047983d2a52c5c335f8ba7f5bab2325') depends_on("dyninst") + depends_on("adeptutils") depends_on("mpi") def install(self, spec, prefix): - configure("--prefix=" + prefix) + cmake("-DCMAKE_INSTALL_PREFIX=" + prefix, + "-DCALLPATH_WALKER=dyninst") make() make("install") -- cgit v1.2.3-70-g09d2 From a4c8e945c730d9028f90bb941eec98352fe6504e Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Tue, 16 Sep 2014 21:52:39 -0700 Subject: Some fixups for Adam's callpath and adept-utils packages. - Make spack packages RPATH *ALL* dependencies (i.e. the whole tree) - prevents callpath link from finding wrong libelf -- always uses the one dyninst used. --- lib/spack/spack/build_environment.py | 2 +- lib/spack/spack/package.py | 2 +- lib/spack/spack/util/executable.py | 2 +- var/spack/packages/adept-utils/package.py | 41 +++++++++++++++++++++++++++++++ var/spack/packages/adeptutils/package.py | 40 ------------------------------ var/spack/packages/callpath/package.py | 9 ++++--- 6 files changed, 49 insertions(+), 47 deletions(-) create mode 100644 var/spack/packages/adept-utils/package.py delete mode 100644 var/spack/packages/adeptutils/package.py (limited to 'var') diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index ec946cd2d7..182a5629fa 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -122,7 +122,7 @@ def set_build_environment_variables(pkg): # Prefixes of all of the package's dependencies go in # SPACK_DEPENDENCIES - dep_prefixes = [d.package.prefix for d in pkg.spec.dependencies.values()] + dep_prefixes = [d.prefix for d in pkg.spec.traverse(root=False)] path_set(SPACK_DEPENDENCIES, dep_prefixes) # Install prefix diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index b0a9dd76b9..3e253286e8 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -773,7 +773,7 @@ class Package(object): ' '.join(formatted_deps)) self.remove_prefix() - tty.msg("Successfully uninstalled %s." % self.spec) + tty.msg("Successfully uninstalled %s." % self.spec.short_spec) # Once everything else is done, run post install hooks spack.hooks.post_uninstall(self) diff --git a/lib/spack/spack/util/executable.py b/lib/spack/spack/util/executable.py index bc27b25889..923c7c19a5 100644 --- a/lib/spack/spack/util/executable.py +++ b/lib/spack/spack/util/executable.py @@ -121,7 +121,7 @@ def which(name, **kwargs): for dir in path: exe = os.path.join(dir, name) - if os.access(exe, os.X_OK): + if os.path.isfile(exe) and os.access(exe, os.X_OK): return Executable(exe) if required: diff --git a/var/spack/packages/adept-utils/package.py b/var/spack/packages/adept-utils/package.py new file mode 100644 index 0000000000..2515322ec2 --- /dev/null +++ b/var/spack/packages/adept-utils/package.py @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2013, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Written by Todd Gamblin, tgamblin@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 AdeptUtils(Package): + """Utility libraries for LLNL performance tools.""" + + homepage = "https://github.com/scalability-llnl/adept-utils" + url = "https://github.com/scalability-llnl/adept-utils/archive/v1.0.tar.gz" + + version('1.0', '5c6cd9badce56c945ac8551e34804397') + + depends_on("boost") + depends_on("mpi") + + def install(self, spec, prefix): + cmake(*std_cmake_args) + make() + make("install") diff --git a/var/spack/packages/adeptutils/package.py b/var/spack/packages/adeptutils/package.py deleted file mode 100644 index 41bf7882db..0000000000 --- a/var/spack/packages/adeptutils/package.py +++ /dev/null @@ -1,40 +0,0 @@ -############################################################################## -# Copyright (c) 2013, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Written by Todd Gamblin, tgamblin@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 Adeptutils(Package): - """LLNL Utility Libraries""" - - homepage = "https://github.com/scalability-llnl/adept-utils" - url = "https://github.com/scalability-llnl/adept-utils/archive/v1.0.tar.gz" - - version('1.0', '5c6cd9badce56c945ac8551e34804397') - - depends_on("mpi") - - def install(self, spec, prefix): - cmake("-DCMAKE_INSTALL_PREFIX=" + prefix) - make() - make("install") diff --git a/var/spack/packages/callpath/package.py b/var/spack/packages/callpath/package.py index 3cbfc26060..84170d9c9e 100644 --- a/var/spack/packages/callpath/package.py +++ b/var/spack/packages/callpath/package.py @@ -25,7 +25,8 @@ from spack import * class Callpath(Package): - """Library for representing callpaths consistently in distributed-memory performance tools.""" + """Library for representing callpaths consistently in + distributed-memory performance tools.""" homepage = "https://github.com/scalability-llnl/callpath" url = "https://github.com/scalability-llnl/callpath/archive/v1.0.1.tar.gz" @@ -33,11 +34,11 @@ class Callpath(Package): version('1.0.1', '0047983d2a52c5c335f8ba7f5bab2325') depends_on("dyninst") - depends_on("adeptutils") + depends_on("adept-utils") depends_on("mpi") def install(self, spec, prefix): - cmake("-DCMAKE_INSTALL_PREFIX=" + prefix, - "-DCALLPATH_WALKER=dyninst") + # TODO: offer options for the walker used. + cmake('.', "-DCALLPATH_WALKER=dyninst", *std_cmake_args) make() make("install") -- cgit v1.2.3-70-g09d2