From 7e5afd1e73a1f85ddf025adfed72991d6bf5f3bb Mon Sep 17 00:00:00 2001 From: iarspider Date: Sun, 23 Jan 2022 13:27:18 +0100 Subject: libzmq: add variants "docs", "libbsd" (#28503) --- var/spack/repos/builtin/packages/libzmq/package.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/libzmq/package.py b/var/spack/repos/builtin/packages/libzmq/package.py index 829fc073c5..1827f986e3 100644 --- a/var/spack/repos/builtin/packages/libzmq/package.py +++ b/var/spack/repos/builtin/packages/libzmq/package.py @@ -34,6 +34,13 @@ class Libzmq(AutotoolsPackage): variant("drafts", default=False, description="Build and install draft classes and methods") + variant("docs", default=True, + description="Build documentation") + + variant("libbsd", default=True, + description="Use strlcpy from libbsd " + + "(will use own implementation if false)") + depends_on("libsodium", when='+libsodium') depends_on("libsodium@:1.0.3", when='+libsodium@:4.1.2') @@ -41,11 +48,11 @@ class Libzmq(AutotoolsPackage): depends_on('automake', type='build', when='@develop') depends_on('libtool', type='build', when='@develop') depends_on('pkgconfig', type='build') - depends_on('docbook-xml', type='build') - depends_on('docbook-xsl', type='build') + depends_on('docbook-xml', type='build', when='+docs') + depends_on('docbook-xsl', type='build', when='+docs') - depends_on('libbsd', type='link', when='@4.3.3: platform=linux') - depends_on('libbsd', type='link', when='@4.3.3: platform=cray') + depends_on('libbsd', when='@4.3.3: platform=linux +libbsd') + depends_on('libbsd', when='@4.3.3: platform=cray +libbsd') conflicts('%gcc@8:', when='@:4.2.2') @@ -68,9 +75,12 @@ class Libzmq(AutotoolsPackage): config_args = [] config_args.extend(self.enable_or_disable("drafts")) + config_args.extend(self.enable_or_disable("libbsd")) if '+libsodium' in self.spec: config_args.append('--with-libsodium') + if '~docs' in self.spec: + config_args.append('--without-docs') if 'clang' in self.compiler.cc: config_args.append("CFLAGS=-Wno-gnu") config_args.append("CXXFLAGS=-Wno-gnu") -- cgit v1.2.3-60-g2f50