diff options
| author | Mark W. Krentel <krentel@rice.edu> | 2021-10-12 12:01:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-12 19:01:46 +0200 |
| commit | 2edfccf61dd0cd858c8df525faaca73f2e185279 (patch) | |
| tree | fc4fd5413dbd46d7074f05433e65511fe68af3d4 /var/spack/repos/builtin/packages/binutils/package.py | |
| parent | e2a64bb483f42a2ce73a8148eac2b821e8173b30 (diff) | |
| download | spack-2edfccf61dd0cd858c8df525faaca73f2e185279.tar.gz spack-2edfccf61dd0cd858c8df525faaca73f2e185279.tar.bz2 spack-2edfccf61dd0cd858c8df525faaca73f2e185279.tar.xz spack-2edfccf61dd0cd858c8df525faaca73f2e185279.zip | |
binutils: fix parallel make for version 2.36 (#26611)
There was a bug in 2.36.* of missing Makefile dependencies. The
previous workaround was to require 2.36 to be built serially. This is
now fixed upstream in 2.37 and this PR adds the patch to restore
parallel make to 2.36.
Diffstat (limited to 'var/spack/repos/builtin/packages/binutils/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/binutils/package.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py index 3bd2d57fb4..67e4fdd8f5 100644 --- a/var/spack/repos/builtin/packages/binutils/package.py +++ b/var/spack/repos/builtin/packages/binutils/package.py @@ -48,6 +48,10 @@ class Binutils(AutotoolsPackage, GNUMirrorPackage): patch('cr16.patch', when='@:2.29.1') patch('update_symbol-2.26.patch', when='@2.26') + # 2.36 is missing some dependencies, this patch allows a parallel build. + # https://sourceware.org/bugzilla/show_bug.cgi?id=27482 + patch('parallel-build-2.36.patch', when='@2.36') + depends_on('zlib') depends_on('diffutils', type='build') depends_on('gettext', when='+nls') @@ -123,13 +127,6 @@ class Binutils(AutotoolsPackage, GNUMirrorPackage): return args - # 2.36 is missing some dependencies and requires serial make install. - # https://sourceware.org/bugzilla/show_bug.cgi?id=27482 - @when('@2.36:') - def install(self, spec, prefix): - with working_dir(self.build_directory): - make('-j', '1', *self.install_targets) - @run_after('install') def install_headers(self): # some packages (like TAU) need the ELF headers, so install them |