From afbc67fdd83eda19aee6ff2621fa88636d5f9caf Mon Sep 17 00:00:00 2001 From: Cameron Stanavige Date: Thu, 28 Oct 2021 06:00:54 -0700 Subject: dtcmp & lwgrp: add shared variant (#26999) --- var/spack/repos/builtin/packages/dtcmp/package.py | 14 +++++++++++--- var/spack/repos/builtin/packages/lwgrp/package.py | 11 +++++++++-- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/dtcmp/package.py b/var/spack/repos/builtin/packages/dtcmp/package.py index 8ba04c4f72..5db711f917 100644 --- a/var/spack/repos/builtin/packages/dtcmp/package.py +++ b/var/spack/repos/builtin/packages/dtcmp/package.py @@ -10,9 +10,11 @@ class Dtcmp(AutotoolsPackage): """The Datatype Comparison Library provides comparison operations and parallel sort algorithms for MPI applications.""" - homepage = "https://github.com/hpc/dtcmp" - url = "https://github.com/hpc/dtcmp/releases/download/v1.0.3/dtcmp-1.0.3.tar.gz" + homepage = "https://github.com/LLNL/dtcmp" + url = "https://github.com/LLNL/dtcmp/releases/download/v1.0.3/dtcmp-1.0.3.tar.gz" + git = "https://github.com/LLNL/dtcmp.git" + version('main', branch='main') version('1.1.3', sha256='90b32cadd0ff2f4fa7fc916f8dcfdbe6918e3e285e0292a2470772478ca0aab5') version('1.1.2', sha256='76e1d1fed89bf6abf003179a7aed93350d5ce6282cb000b02a241ec802ec399d') version('1.1.1', sha256='ddf3c57cbb83515e1b7e4111b8a83f832e66376b40eee5d8a5549dd7b8446bc6') @@ -22,5 +24,11 @@ class Dtcmp(AutotoolsPackage): depends_on('mpi') depends_on('lwgrp') + variant('shared', default=True, description='Build with shared libraries') + depends_on('lwgrp+shared', when='+shared') + depends_on('lwgrp~shared', when='~shared') + def configure_args(self): - return ["--with-lwgrp=" + self.spec['lwgrp'].prefix] + args = ['--with-lwgrp=%s' % self.spec['lwgrp'].prefix] + args.extend(self.enable_or_disable('shared')) + return args diff --git a/var/spack/repos/builtin/packages/lwgrp/package.py b/var/spack/repos/builtin/packages/lwgrp/package.py index 60301557b7..7372f3f795 100644 --- a/var/spack/repos/builtin/packages/lwgrp/package.py +++ b/var/spack/repos/builtin/packages/lwgrp/package.py @@ -10,11 +10,18 @@ class Lwgrp(AutotoolsPackage): """Thie light-weight group library provides process group representations using O(log N) space and time.""" - homepage = "https://github.com/hpc/lwgrp" - url = "https://github.com/hpc/lwgrp/releases/download/v1.0.2/lwgrp-1.0.2.tar.gz" + homepage = "https://github.com/LLNL/lwgrp" + url = "https://github.com/LLNL/lwgrp/releases/download/v1.0.2/lwgrp-1.0.2.tar.gz" + git = "https://github.com/LLNL/lwgrp.git" + version('main', branch='main') version('1.0.4', sha256='0c933df7658660a0225f8e3a940eb2621efa4421397859417c8d90d906d4e90a') version('1.0.3', sha256='20b2fc3908bfdf04d1c177f86e227a147214cd155c548b3dd75e54c78e1c1c47') version('1.0.2', sha256='c9d4233946e40f01efd0b4644fd9224becec51b9b5f8cbf45f5bac3129b5b536') depends_on('mpi') + + variant('shared', default=True, description='Build with shared libraries') + + def configure_args(self): + return self.enable_or_disable('shared') -- cgit v1.2.3-60-g2f50