summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2015-11-23 15:42:09 -0800
committerTodd Gamblin <tgamblin@llnl.gov>2015-11-23 15:42:09 -0800
commit8fbd79fa2ef848d88ae5772e437148f395013303 (patch)
tree7564e432461eb3fe47d27c202988a3087571e733 /var
parent9d4638ef4c22c338f9c2dce26ec21f438ab7b319 (diff)
parent60fd7e22685c5948309362bbd5e01ae5f5e7dd02 (diff)
downloadspack-8fbd79fa2ef848d88ae5772e437148f395013303.tar.gz
spack-8fbd79fa2ef848d88ae5772e437148f395013303.tar.bz2
spack-8fbd79fa2ef848d88ae5772e437148f395013303.tar.xz
spack-8fbd79fa2ef848d88ae5772e437148f395013303.zip
Merge pull request #198 from eschnett/update-papi
Update PAPI
Diffstat (limited to 'var')
-rw-r--r--var/spack/packages/papi/package.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/var/spack/packages/papi/package.py b/var/spack/packages/papi/package.py
index 596f7114d6..097b8c41ec 100644
--- a/var/spack/packages/papi/package.py
+++ b/var/spack/packages/papi/package.py
@@ -13,6 +13,7 @@ class Papi(Package):
homepage = "http://icl.cs.utk.edu/papi/index.html"
url = "http://icl.cs.utk.edu/projects/papi/downloads/papi-5.3.0.tar.gz"
+ version('5.4.1', '9134a99219c79767a11463a76b0b01a2')
version('5.3.0', '367961dd0ab426e5ae367c2713924ffb')
def install(self, spec, prefix):
@@ -20,13 +21,10 @@ class Papi(Package):
configure_args=["--prefix=%s" % prefix]
- # need to force consistency in the use of compilers
- if spec.satisfies('%gcc'):
- configure_args.append('CC=gcc')
- configure_args.append('MPICH_CC=gcc')
- if spec.satisfies('%intel'):
- configure_args.append('CC=icc')
- configure_args.append('MPICH_CC=icc')
+ # PAPI uses MPI if MPI is present; since we don't require an
+ # MPI package, we ensure that all attempts to use MPI fail, so
+ # that PAPI does not get confused
+ configure_args.append('MPICC=:')
configure(*configure_args)