diff options
author | alalazo <massimiliano.culpo@googlemail.com> | 2016-06-18 13:06:37 +0200 |
---|---|---|
committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-06-18 13:06:37 +0200 |
commit | 51cf8476471b1d4b4bbffa89b7c3ae2485f18ccd (patch) | |
tree | 0d5d6b9b2c3f66f371c1ffb96108150deb41f6bb /var/spack/repos/builtin/packages/binutils/package.py | |
parent | bdd874eb7fad2e193cb1186a499b9cd742632f62 (diff) | |
parent | 62b2f2a7c9d54fb864e6aae91f1f47a1b35d1828 (diff) | |
download | spack-51cf8476471b1d4b4bbffa89b7c3ae2485f18ccd.tar.gz spack-51cf8476471b1d4b4bbffa89b7c3ae2485f18ccd.tar.bz2 spack-51cf8476471b1d4b4bbffa89b7c3ae2485f18ccd.tar.xz spack-51cf8476471b1d4b4bbffa89b7c3ae2485f18ccd.zip |
Merge branch 'develop' of https://github.com/LLNL/spack into features/module_file_explicit_load
Conflicts:
lib/spack/spack/test/modules.py
Diffstat (limited to 'var/spack/repos/builtin/packages/binutils/package.py')
-rw-r--r-- | var/spack/repos/builtin/packages/binutils/package.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py index 9e4cc98ae6..5f305abb02 100644 --- a/var/spack/repos/builtin/packages/binutils/package.py +++ b/var/spack/repos/builtin/packages/binutils/package.py @@ -30,8 +30,9 @@ class Binutils(Package): url="https://ftp.gnu.org/gnu/binutils/binutils-2.25.tar.bz2" + # 2.26 is incompatible with py-pillow build for some reason. version('2.26', '64146a0faa3b411ba774f47d41de239f') - version('2.25', 'd9f3303f802a5b6b0bb73a335ab89d66') + version('2.25', 'd9f3303f802a5b6b0bb73a335ab89d66', preferred=True) version('2.24', 'e0f71a7b2ddab0f8612336ac81d9636b') version('2.23.2', '4f8fa651e35ef262edc01d60fb45702e') version('2.20.1', '2b9dc8f2b7dbd5ec5992c6e29de0b764') |