summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorHarmen Stoppels <harmenstoppels@gmail.com>2021-04-06 21:00:32 +0200
committerGitHub <noreply@github.com>2021-04-06 14:00:32 -0500
commita989521052f456e653b09955a22d4ffea7cf0c7a (patch)
treea700b28cef1b7c1fe2bea22edfe4f0440135e0fb /var
parentbbc666a1d239f6d5bba66df3fdd10a7eb261dc03 (diff)
downloadspack-a989521052f456e653b09955a22d4ffea7cf0c7a.tar.gz
spack-a989521052f456e653b09955a22d4ffea7cf0c7a.tar.bz2
spack-a989521052f456e653b09955a22d4ffea7cf0c7a.tar.xz
spack-a989521052f456e653b09955a22d4ffea7cf0c7a.zip
Squashfuse: Enable or disable static and shared libs, and allow min size builds too, useful for appimages (#22669)
* Enable or disable static and shared libs, and allow min size builds too, useful for appimages * Fix master version
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/squashfuse/package.py24
1 files changed, 20 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/squashfuse/package.py b/var/spack/repos/builtin/packages/squashfuse/package.py
index aa43bcc894..7bce4a6b2a 100644
--- a/var/spack/repos/builtin/packages/squashfuse/package.py
+++ b/var/spack/repos/builtin/packages/squashfuse/package.py
@@ -19,12 +19,18 @@ class Squashfuse(AutotoolsPackage):
version('0.1.104', sha256='aa52460559e0d0b1753f6b1af5c68cfb777ca5a13913285e93f4f9b7aa894b3a')
version('0.1.103', sha256='42d4dfd17ed186745117cfd427023eb81effff3832bab09067823492b6b982e7')
+ variant('shared', default=True, description='Enable shared libraries')
+ variant('static', default=True, description='Enable static libraries')
+ variant('min_size', default=False, description='Build small binaries')
+
variant('zlib', default=True, description='Enable zlib/gzip compression support')
variant('lz4', default=True, description='Enable LZ4 compression support')
variant('lzo', default=True, description='Enable LZO compression support')
variant('xz', default=True, description='Enable xz compression support')
variant('zstd', default=True, description='Enable Zstandard/zstd support')
+ conflicts('~shared', when='~static', msg="Enable shared, static or both")
+
depends_on('libfuse@2.5:')
depends_on('libfuse@:2.99', when='@:0.1.103')
@@ -40,13 +46,23 @@ class Squashfuse(AutotoolsPackage):
depends_on('xz', when='+xz')
depends_on('zstd', when='+zstd')
- depends_on('m4', type='build', when='master')
- depends_on('autoconf', type='build', when='master')
- depends_on('automake', type='build', when='master')
- depends_on('libtool', type='build', when='master')
+ depends_on('m4', type='build', when='@master')
+ depends_on('autoconf', type='build', when='@master')
+ depends_on('automake', type='build', when='@master')
+ depends_on('libtool', type='build', when='@master')
+
+ def flag_handler(self, name, flags):
+ if name == 'cflags' and '+min_size' in self.spec:
+ if '-Os' in self.compiler.opt_flags:
+ flags.append('-Os')
+ return (None, None, flags)
+
+ return (flags, None, None)
def configure_args(self):
args = ['--disable-demo']
+ args += self.enable_or_disable('shared')
+ args += self.enable_or_disable('static')
args += self.with_or_without('zlib', activation_value='prefix')
args += self.with_or_without('lz4', activation_value='prefix')
args += self.with_or_without('lzo', activation_value='prefix')