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

squashfs: ensure we install with required options (#22863)

Browse Source 
Currently the make install step uses the default variables, which causes
things to rebuild with default options.
This commit is contained in:
Harmen Stoppels 2021-04-08 14:11:40 +02:00 committed by GitHub
parent 5b77046e20
commit 65563946e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
var/spack/repos/builtin/packages/squashfs/package.py
View File

@ -49,19 +49,23 @@ class Squashfs(MakefilePackage):
patch('gcc-10.patch', when="%gcc@10:") patch('gcc-10.patch', when="%gcc@10:")
patch('gcc-10.patch', when="%clang@11:") patch('gcc-10.patch', when="%clang@11:")
def build(self, spec, prefix): def make_options(self, spec):
with working_dir('squashfs-tools'):
default = spec.variants['default_compression'].value default = spec.variants['default_compression'].value
make( return [
'GZIP_SUPPORT={0}'.format(1 if '+gzip' in spec else 0), 'GZIP_SUPPORT={0}'.format(1 if '+gzip' in spec else 0),
'LZ4_SUPPORT={0}' .format(1 if '+lz4' in spec else 0), 'LZ4_SUPPORT={0}' .format(1 if '+lz4' in spec else 0),
'LZO_SUPPORT={0}' .format(1 if '+lzo' in spec else 0), 'LZO_SUPPORT={0}' .format(1 if '+lzo' in spec else 0),
'XZ_SUPPORT={0}' .format(1 if '+xz' in spec else 0), 'XZ_SUPPORT={0}' .format(1 if '+xz' in spec else 0),
'ZSTD_SUPPORT={0}'.format(1 if '+zstd' in spec else 0), 'ZSTD_SUPPORT={0}'.format(1 if '+zstd' in spec else 0),
'COMP_DEFAULT={0}'.format(default), 'COMP_DEFAULT={0}'.format(default),
parallel=False ]
)
def build(self, spec, prefix):
options = self.make_options(spec)
with working_dir('squashfs-tools'):
make(*options, parallel=False)
def install(self, spec, prefix): def install(self, spec, prefix):
options = self.make_options(spec)
with working_dir('squashfs-tools'): with working_dir('squashfs-tools'):
make('install', 'INSTALL_DIR=%s' % prefix.bin, parallel=False) make('install', 'INSTALL_DIR=%s' % prefix.bin, *options, parallel=False)