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

zstd: bring back libs=shared,static and compression=zlib,lz4,lzma variants (#29995)

Browse Source 
* zstd: bring back libs=shared,static and compression=zlib,lz4,lzma variants

Should make building `gcc+binutils ^zstd libs=static` a bit easier (this
is the case where we don't control the compiler wrappers of gcc because
of bootstrapping, nor of ld because of how gcc invokes the linker).
This commit is contained in:
Harmen Stoppels 2022-04-11 17:30:30 +02:00 committed by GitHub
parent b71661eaa6
commit 8deb50fea5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
var/spack/repos/builtin/packages/zstd/package.py
View File

@ -33,34 +33,50 @@ class Zstd(MakefilePackage):
version('1.1.2', sha256='980b8febb0118e22f6ed70d23b5b3e600995dbf7489c1f6d6122c1411cdda8d8') version('1.1.2', sha256='980b8febb0118e22f6ed70d23b5b3e600995dbf7489c1f6d6122c1411cdda8d8')
variant('programs', default=False, description='Build executables') variant('programs', default=False, description='Build executables')
variant('libs', default='shared,static', values=('shared', 'static'),
multi=True, description='Build shared libs, static libs or both')
variant('compression', when='+programs',
values=any_combination_of('zlib', 'lz4', 'lzma'),
description='Enable support for additional compression methods in programs')
depends_on('zlib', when='+programs') depends_on('zlib', when='compression=zlib')
depends_on('lz4', when='+programs') depends_on('lz4', when='compression=lz4')
depends_on('xz', when='+programs') depends_on('xz', when='compression=lzma')
# +programs builds vendored xxhash, which uses unsupported builtins # +programs builds vendored xxhash, which uses unsupported builtins
# (last tested: nvhpc@22.3) # (last tested: nvhpc@22.3)
conflicts('+programs %nvhpc') conflicts('+programs %nvhpc')
def _make(self, *args, **kwargs): def build(self, spec, prefix):
# PREFIX must be defined on macOS even when building the library, since pass
# it gets hardcoded into the library's install_path
def_args = ['VERBOSE=1', 'PREFIX=' + self.prefix] def install(self, spec, prefix):
args = ['VERBOSE=1', 'PREFIX=' + prefix]
# Tested %nvhpc@22.3. No support for -MP # Tested %nvhpc@22.3. No support for -MP
if '%nvhpc' in self.spec: if '%nvhpc' in self.spec:
def_args.append('DEPFLAGS=-MT $@ -MMD -MF') args.append('DEPFLAGS=-MT $@ -MMD -MF')
def_args.append('-C') # library targets
def_args.extend(args) lib_args = ['-C', 'lib'] + args + ['install-pc', 'install-includes']
make(*def_args, **kwargs) if 'libs=shared' in spec:
lib_args.append('install-shared')
if 'libs=static' in spec:
lib_args.append('install-static')
def build(self, spec, prefix): # install the library
self._make('lib') make(*lib_args)
if spec.variants['programs'].value:
self._make('programs')
def install(self, spec, prefix): # install the programs
self._make('lib', 'install', parallel=False) if '+programs' in spec:
if spec.variants['programs'].value: programs_args = ['-C', 'programs'] + args
self._make('programs', 'install') # additional compression programs have to be turned off, otherwise the
# makefile will detect them.
if 'compression=zlib' not in spec:
programs_args.append('HAVE_ZLIB=0')
if 'compression=lzma' not in spec:
programs_args.append('HAVE_LZMA=0')
if 'compression=lz4' not in spec:
programs_args.append('HAVE_LZ4=0')
programs_args.append('install')
make(*programs_args)