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

hwloc: replace 'shared' variant with 'libs' (#32093)

Browse Source 
* hwloc: replace 'shared' variant with 'libs'
* PEP-8
* Fix gpi-space
This commit is contained in:
iarspider
2022-09-27 13:53:57 +02:00
committed by GitHub
parent 43ceff4193
commit 9f271fa388
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/gpi-space/package.py
View File

@@ -58,7 +58,7 @@ class GpiSpace(CMakePackage):
"+atomic +chrono +coroutine +context +date_time +filesystem +iostreams" "+atomic +chrono +coroutine +context +date_time +filesystem +iostreams"
" +program_options +random +regex +serialization +test +timer cxxstd=14" " +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("libssh2@1.7:")
depends_on("openssl@0.9:") depends_on("openssl@0.9:")
depends_on("gpi-2@1.3.2:1.3.3 fabrics=infiniband", when="network=infiniband") depends_on("gpi-2@1.3.2:1.3.3 fabrics=infiniband", when="network=infiniband")

10
var/spack/repos/builtin/packages/hwloc/package.py
View File

@@ -74,7 +74,13 @@ class Hwloc(AutotoolsPackage):
default=(sys.platform != "darwin"), default=(sys.platform != "darwin"),
description="Support analyzing devices on PCI bus", 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( variant(
"cairo", default=False, description="Enable the Cairo back-end of hwloc's lstopo command" "cairo", default=False, description="Enable the Cairo back-end of hwloc's lstopo command"
) )
@@ -178,7 +184,7 @@ def configure_args(self):
args.extend(self.enable_or_disable("libxml2")) args.extend(self.enable_or_disable("libxml2"))
args.extend(self.enable_or_disable("libudev")) args.extend(self.enable_or_disable("libudev"))
args.extend(self.enable_or_disable("pci")) 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: if "+cuda" in self.spec:
args.append("--with-cuda={0}".format(self.spec["cuda"].prefix)) args.append("--with-cuda={0}".format(self.spec["cuda"].prefix))