diff options
| author | iarspider <iarspider@gmail.com> | 2022-09-27 13:53:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-27 05:53:57 -0600 |
| commit | 9f271fa38834b3e40daa9468024991aaaed0ba34 (patch) | |
| tree | 4c5d29a458efc8bbb1a5a5a3f01b7da9cef10dc3 | |
| parent | 43ceff4193ebb5ab12594f1ace3d39b61e95393c (diff) | |
| download | spack-9f271fa38834b3e40daa9468024991aaaed0ba34.tar.gz spack-9f271fa38834b3e40daa9468024991aaaed0ba34.tar.bz2 spack-9f271fa38834b3e40daa9468024991aaaed0ba34.tar.xz spack-9f271fa38834b3e40daa9468024991aaaed0ba34.zip | |
hwloc: replace 'shared' variant with 'libs' (#32093)
* hwloc: replace 'shared' variant with 'libs'
* PEP-8
* Fix gpi-space
| -rw-r--r-- | var/spack/repos/builtin/packages/gpi-space/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/hwloc/package.py | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/gpi-space/package.py b/var/spack/repos/builtin/packages/gpi-space/package.py index c5f9be68a5..97dc85159f 100644 --- a/var/spack/repos/builtin/packages/gpi-space/package.py +++ b/var/spack/repos/builtin/packages/gpi-space/package.py @@ -58,7 +58,7 @@ class GpiSpace(CMakePackage): "+atomic +chrono +coroutine +context +date_time +filesystem +iostreams" " +program_options +random +regex +serialization +test +timer cxxstd=14" ) - depends_on("hwloc@1.10: +libudev ~shared ~libxml2") + depends_on("hwloc@1.10: +libudev ~libxml2 libs=static") depends_on("libssh2@1.7:") depends_on("openssl@0.9:") depends_on("gpi-2@1.3.2:1.3.3 fabrics=infiniband", when="network=infiniband") diff --git a/var/spack/repos/builtin/packages/hwloc/package.py b/var/spack/repos/builtin/packages/hwloc/package.py index 8f6b15308c..b35daa2074 100644 --- a/var/spack/repos/builtin/packages/hwloc/package.py +++ b/var/spack/repos/builtin/packages/hwloc/package.py @@ -74,7 +74,13 @@ class Hwloc(AutotoolsPackage): default=(sys.platform != "darwin"), description="Support analyzing devices on PCI bus", ) - variant("shared", default=True, description="Build shared libraries") + variant( + "libs", + default="shared,static", + values=("shared", "static"), + multi=True, + description="Build shared libs, static libs or both", + ) variant( "cairo", default=False, description="Enable the Cairo back-end of hwloc's lstopo command" ) @@ -178,7 +184,7 @@ class Hwloc(AutotoolsPackage): args.extend(self.enable_or_disable("libxml2")) args.extend(self.enable_or_disable("libudev")) args.extend(self.enable_or_disable("pci")) - args.extend(self.enable_or_disable("shared")) + args.extend(self.enable_or_disable("libs")) if "+cuda" in self.spec: args.append("--with-cuda={0}".format(self.spec["cuda"].prefix)) |