hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'efischer/160914-FixBinutils226Question' of git://github.com/citibeth/spack into bugfix/efischer-160914-FixBinutils226Question

Browse source
This commit is contained in:
Todd Gamblin 2016-09-21 01:45:38 -07:00
commit ae6252ca5f
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
var/spack/repos/builtin/packages/binutils/package.py
View file

@ -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')

2
var/spack/repos/builtin/packages/py-scipy/package.py
View file

@ -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):