diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-05-11 02:26:07 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-05-11 02:26:07 -0700 |
| commit | 9030541e4bc3a77f90d16969b6fff0afa387847c (patch) | |
| tree | 0934a772d3fb381e8108fbc9c22200e26de5c3d6 /var | |
| parent | 98faee1d5c24ddacaeb1bc630ff8c31ba0d74f9b (diff) | |
| parent | 78d25ad337e2faaa8cfd589607801acb78aec4d9 (diff) | |
| download | spack-9030541e4bc3a77f90d16969b6fff0afa387847c.tar.gz spack-9030541e4bc3a77f90d16969b6fff0afa387847c.tar.bz2 spack-9030541e4bc3a77f90d16969b6fff0afa387847c.tar.xz spack-9030541e4bc3a77f90d16969b6fff0afa387847c.zip | |
Merge pull request #929 from epfl-scitas/differentiate_framework_from_packages
QA : make qa checking less painful
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/ImageMagick/package.py | 14 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/Mitos/package.py | 7 |
2 files changed, 11 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/ImageMagick/package.py b/var/spack/repos/builtin/packages/ImageMagick/package.py index 753ea80ca6..3a86d9fb7c 100644 --- a/var/spack/repos/builtin/packages/ImageMagick/package.py +++ b/var/spack/repos/builtin/packages/ImageMagick/package.py @@ -1,10 +1,11 @@ from spack import * + class Imagemagick(Package): """ImageMagick is a image processing library""" homepage = "http://www.imagemagic.org" - #------------------------------------------------------------------------- + # ------------------------------------------------------------------------- # ImageMagick does not keep around anything but *-10 versions, so # this URL may change. If you want the bleeding edge, you can # uncomment it and see if it works but you may need to try to @@ -17,14 +18,16 @@ class Imagemagick(Package): # version('6.9.0-6', 'c1bce7396c22995b8bdb56b7797b4a1b', # url="http://www.imagemagick.org/download/ImageMagick-6.9.0-6.tar.bz2") - #------------------------------------------------------------------------- + # ------------------------------------------------------------------------- # *-10 versions are archived, so these versions should fetch reliably. # ------------------------------------------------------------------------- - version('6.8.9-10', 'aa050bf9785e571c956c111377bbf57c', - url="http://sourceforge.net/projects/imagemagick/files/old-sources/6.x/6.8/ImageMagick-6.8.9-10.tar.gz/download") + version( + '6.8.9-10', + 'aa050bf9785e571c956c111377bbf57c', + url="http://sourceforge.net/projects/imagemagick/files/old-sources/6.x/6.8/ImageMagick-6.8.9-10.tar.gz/download") - depends_on('libtool') depends_on('jpeg') + depends_on('libtool') depends_on('libpng') depends_on('freetype') depends_on('fontconfig') @@ -32,6 +35,5 @@ class Imagemagick(Package): def install(self, spec, prefix): configure("--prefix=%s" % prefix) - make() make("install") diff --git a/var/spack/repos/builtin/packages/Mitos/package.py b/var/spack/repos/builtin/packages/Mitos/package.py index ea131872dd..ec1d56a5c7 100644 --- a/var/spack/repos/builtin/packages/Mitos/package.py +++ b/var/spack/repos/builtin/packages/Mitos/package.py @@ -1,19 +1,18 @@ from spack import * + class Mitos(Package): """Mitos is a library and a tool for collecting sampled memory performance data to view with MemAxes""" homepage = "https://github.com/llnl/Mitos" - url = "https://github.com/llnl/Mitos" + url = "https://github.com/llnl/Mitos" version('0.9.2', git='https://github.com/llnl/Mitos.git', commit='8cb143a2e8c00353ff531a781a9ca0992b0aaa3d') - version('0.9.1', - git='https://github.com/llnl/Mitos.git', - tag='v0.9.1') + version('0.9.1', git='https://github.com/llnl/Mitos.git', tag='v0.9.1') depends_on('dyninst@8.2.1:') depends_on('hwloc') |