diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-09-21 01:45:38 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-09-21 01:45:38 -0700 |
| commit | ae6252ca5f5c88c792816b589ffb7cf278ceda25 (patch) | |
| tree | 48a6a4db1599a2aac58135e81c169174e9aa7b21 | |
| parent | d3e04b3daf3f30729cfb90790cf4081364e911f1 (diff) | |
| parent | a954d0976af30df460689fa817599f6c221b252a (diff) | |
| download | spack-ae6252ca5f5c88c792816b589ffb7cf278ceda25.tar.gz spack-ae6252ca5f5c88c792816b589ffb7cf278ceda25.tar.bz2 spack-ae6252ca5f5c88c792816b589ffb7cf278ceda25.tar.xz spack-ae6252ca5f5c88c792816b589ffb7cf278ceda25.zip | |
Merge branch 'efischer/160914-FixBinutils226Question' of git://github.com/citibeth/spack into bugfix/efischer-160914-FixBinutils226Question
| -rw-r--r-- | var/spack/repos/builtin/packages/binutils/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-pillow/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-scipy/package.py | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py index 2271c7cfcc..bf49ca9405 100644 --- a/var/spack/repos/builtin/packages/binutils/package.py +++ b/var/spack/repos/builtin/packages/binutils/package.py @@ -32,9 +32,8 @@ class Binutils(Package): url = "https://ftp.gnu.org/gnu/binutils/binutils-2.25.tar.bz2" version('2.27', '2869c9bf3e60ee97c74ac2a6bf4e9d68') - # 2.26 is incompatible with py-pillow build for some reason. version('2.26', '64146a0faa3b411ba774f47d41de239f') - version('2.25', 'd9f3303f802a5b6b0bb73a335ab89d66', preferred=True) + version('2.25', 'd9f3303f802a5b6b0bb73a335ab89d66') version('2.24', 'e0f71a7b2ddab0f8612336ac81d9636b') version('2.23.2', '4f8fa651e35ef262edc01d60fb45702e') version('2.20.1', '2b9dc8f2b7dbd5ec5992c6e29de0b764') diff --git a/var/spack/repos/builtin/packages/py-pillow/package.py b/var/spack/repos/builtin/packages/py-pillow/package.py index 1d8b3faa6f..211e3b4199 100644 --- a/var/spack/repos/builtin/packages/py-pillow/package.py +++ b/var/spack/repos/builtin/packages/py-pillow/package.py @@ -32,7 +32,7 @@ class PyPillow(Package): capabilities.""" homepage = "https://python-pillow.org/" - url = "https://pypi.python.org/packages/source/P/Pillow/Pillow-3.0.0.tar.gz" + url = "https://pypi.python.org/packages/source/P/Pillow/Pillow-3.0.0.tar.gz" # TODO: This version should be deleted once the next release comes out. # TODO: It fixes a bug that prevented us from linking to Tk/Tcl. diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index cab516e1df..83a69c5682 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -28,7 +28,7 @@ from spack import * class PyScipy(Package): """Scientific Library for Python.""" homepage = "http://www.scipy.org/" - url = "https://pypi.python.org/packages/source/s/scipy/scipy-0.15.0.tar.gz" + url = "https://pypi.python.org/packages/source/s/scipy/scipy-0.15.0.tar.gz" version('0.17.0', '5ff2971e1ce90e762c59d2cd84837224') version('0.15.1', 'be56cd8e60591d6332aac792a5880110') @@ -36,6 +36,8 @@ class PyScipy(Package): extends('python') depends_on('py-nose', type='build') + # Known not to work with 2.23, 2.25 + depends_on('binutils@2.26:', type='build') depends_on('py-numpy+blas+lapack', type=nolink) def install(self, spec, prefix): |