zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GCC 6/7 build on APFS (#7696)

Browse Source
This commit is contained in:
Adam J. Stewart 2018-04-10 11:46:44 -05:00 committed by GitHub
parent ecc481a9a7
commit 69f94f18a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
var/spack/repos/builtin/packages/gcc/package.py
View File

@ -102,13 +102,12 @@ class Gcc(AutotoolsPackage):
# depends_on('ppl') # depends_on('ppl')
# depends_on('cloog') # depends_on('cloog')
# TODO: Add a 'test' deptype # https://gcc.gnu.org/install/test.html
# https://github.com/spack/spack/issues/1279 depends_on('dejagnu@1.4.4', type='test')
# depends_on('dejagnu@1.4.4', type='test') depends_on('expect', type='test')
# depends_on('expect', type='test') depends_on('tcl', type='test')
# depends_on('tcl', type='test') depends_on('autogen@5.5.4:', type='test')
# depends_on('autogen@5.5.4:', type='test') depends_on('guile@1.4.1:', type='test')
# depends_on('guile@1.4.1:', type='test')
# See https://golang.org/doc/install/gccgo#Releases # See https://golang.org/doc/install/gccgo#Releases
provides('golang', when='languages=go @4.6:') provides('golang', when='languages=go @4.6:')
@ -158,7 +157,7 @@ class Gcc(AutotoolsPackage):
# Fix parallel build on APFS filesystem # Fix parallel build on APFS filesystem
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81797 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81797
if macOS_version() >= Version('10.13'): if macOS_version() >= Version('10.13'):
patch('darwin/apfs.patch', when='@7.2.0') patch('darwin/apfs.patch', when='@6.1:6.4,7.1:7.3')
patch('darwin/gcc-7.1.0-headerpad.patch', when='@5:') patch('darwin/gcc-7.1.0-headerpad.patch', when='@5:')
patch('darwin/gcc-6.1.0-jit.patch', when='@5:') patch('darwin/gcc-6.1.0-jit.patch', when='@5:')
patch('darwin/gcc-4.9.patch1', when='@4.9.0:4.9.3') patch('darwin/gcc-4.9.patch1', when='@4.9.0:4.9.3')