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

xfsprogs: add 5.11.0 and fix build with newer versions of gcc (#22665)

Browse source 
xfsdump depends on an older version of xfsprogs that does not build with
recent versions of gcc.
This commit is contained in:
Michael Kuhn 2021-04-06 11:21:48 +02:00 committed by GitHub
parent 8b4cf24ba7
commit 85cdb3d250
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
var/spack/repos/builtin/packages/xfsprogs/package.py
View file

@ -12,6 +12,7 @@ class Xfsprogs(AutotoolsPackage):
homepage = "http://oss.sgi.com/projects/xfs/" homepage = "http://oss.sgi.com/projects/xfs/"
url = "http://kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.17.0.tar.xz" url = "http://kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.17.0.tar.xz"
version('5.11.0', sha256='0e9c390fcdbb8a79e1b8f5e6e25fd529fc9f9c2ef8f2d5e647b3556b82d1b353')
version('5.8.0', sha256='8ef46ed9e6bb927f407f541dc4324857c908ddf1374265edc910d23724048c6b') version('5.8.0', sha256='8ef46ed9e6bb927f407f541dc4324857c908ddf1374265edc910d23724048c6b')
version('5.7.0', sha256='8f2348a68a686a3f4491dda5d62dd32d885fbc52d32875edd41e2c296e7b4f35') version('5.7.0', sha256='8f2348a68a686a3f4491dda5d62dd32d885fbc52d32875edd41e2c296e7b4f35')
version('5.6.0', sha256='0aba2aac5d80d07646dde868437fc337af2c7326edadcc6d6a7c0bfd3190c1e6') version('5.6.0', sha256='0aba2aac5d80d07646dde868437fc337af2c7326edadcc6d6a7c0bfd3190c1e6')
@ -22,6 +23,13 @@ class Xfsprogs(AutotoolsPackage):
depends_on('uuid') depends_on('uuid')
depends_on('util-linux') depends_on('util-linux')
def flag_handler(self, name, flags):
iflags = []
if name == 'cflags':
if self.spec.satisfies('@:5.4.0 %gcc@10:'):
iflags.append('-fcommon')
return (iflags, None, flags)
def setup_build_environment(self, env): def setup_build_environment(self, env):
env.append_path('C_INCLUDE_PATH', env.append_path('C_INCLUDE_PATH',
self.spec['util-linux'].prefix.include.blkid) self.spec['util-linux'].prefix.include.blkid)