diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-06-18 13:31:29 +0200 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-06-18 13:31:29 +0200 |
| commit | a17d1efe7c738d08718fb46ae7a04d52c1a63dc1 (patch) | |
| tree | a166e21e9410c4bbe9dd709dc34ccede3cc2e372 /var/spack/repos/builtin/packages/binutils/package.py | |
| parent | 30c9d976f6e7b74b6713215e8f7c7924a9f43f43 (diff) | |
| parent | 62b2f2a7c9d54fb864e6aae91f1f47a1b35d1828 (diff) | |
| download | spack-a17d1efe7c738d08718fb46ae7a04d52c1a63dc1.tar.gz spack-a17d1efe7c738d08718fb46ae7a04d52c1a63dc1.tar.bz2 spack-a17d1efe7c738d08718fb46ae7a04d52c1a63dc1.tar.xz spack-a17d1efe7c738d08718fb46ae7a04d52c1a63dc1.zip | |
Merge branch 'develop' of https://github.com/LLNL/spack into features/source_diffs_in_environment_modifications
Conflicts:
lib/spack/spack/test/environment.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') |