summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2024-11-25 12:56:39 +0100
committerGitHub <noreply@github.com>2024-11-25 12:56:39 +0100
commit5c67051980007eea3b445b814c2429a3b8d0c5fc (patch)
treec5948431dbaacf42ccf71f332063bb66a6df563f
parentc01fb9a6d28f82073426c7bbd0ec2fec14341d0a (diff)
downloadspack-5c67051980007eea3b445b814c2429a3b8d0c5fc.tar.gz
spack-5c67051980007eea3b445b814c2429a3b8d0c5fc.tar.bz2
spack-5c67051980007eea3b445b814c2429a3b8d0c5fc.tar.xz
spack-5c67051980007eea3b445b814c2429a3b8d0c5fc.zip
Add missing C/C++ dependencies (#47782)
-rw-r--r--var/spack/repos/builtin/packages/bitgroomingz/package.py10
-rw-r--r--var/spack/repos/builtin/packages/fftx/package.py3
-rw-r--r--var/spack/repos/builtin/packages/julia/package.py5
-rw-r--r--var/spack/repos/builtin/packages/lua-sol2/package.py3
-rw-r--r--var/spack/repos/builtin/packages/opencl-clhpp/package.py3
-rw-r--r--var/spack/repos/builtin/packages/pagmo2/package.py3
-rw-r--r--var/spack/repos/builtin/packages/pdt/package.py17
-rw-r--r--var/spack/repos/builtin/packages/py-blosc2/package.py1
-rw-r--r--var/spack/repos/builtin/packages/pygmo/package.py3
-rw-r--r--var/spack/repos/builtin/packages/rocprofiler-register/package.py1
-rw-r--r--var/spack/repos/builtin/packages/voropp/package.py3
-rw-r--r--var/spack/repos/builtin/packages/warpx/package.py1
12 files changed, 30 insertions, 23 deletions
diff --git a/var/spack/repos/builtin/packages/bitgroomingz/package.py b/var/spack/repos/builtin/packages/bitgroomingz/package.py
index 85430a1579..f618da822b 100644
--- a/var/spack/repos/builtin/packages/bitgroomingz/package.py
+++ b/var/spack/repos/builtin/packages/bitgroomingz/package.py
@@ -17,16 +17,12 @@ class Bitgroomingz(CMakePackage):
version("master", branch="master")
version("2022-10-14", commit="a018b20cca9f7d6a5396ab36230e4be6ae1cb25b")
- depends_on("c", type="build") # generated
+ depends_on("c", type="build")
+ depends_on("cxx", type="build")
variant("shared", default=True, description="build shared libs")
depends_on("zlib-api")
def cmake_args(self):
- args = []
- if self.spec.satisfies("+shared"):
- args.append("-DBUILD_SHARED_LIBS=ON")
- else:
- args.append("-DBUILD_SHARED_LIBS=OFF")
- return args
+ return [self.define_from_variant("BUILD_SHARED_LIBS", "shared")]
diff --git a/var/spack/repos/builtin/packages/fftx/package.py b/var/spack/repos/builtin/packages/fftx/package.py
index 96ed533315..b132231d14 100644
--- a/var/spack/repos/builtin/packages/fftx/package.py
+++ b/var/spack/repos/builtin/packages/fftx/package.py
@@ -30,7 +30,8 @@ class Fftx(CMakePackage, CudaPackage, ROCmPackage):
version("1.1.0", sha256="a6f95605abc11460bbf51839727a456a31488e27e12a970fc29a1b8c42f4e3b5")
version("1.0.3", sha256="b5ff275facce4a2fbabd0aecc65dd55b744794f2e07cd8cfa91363001c664896")
- depends_on("cxx", type="build") # generated
+ depends_on("c", type="build")
+ depends_on("cxx", type="build")
depends_on("spiral-software+fftx+simt+jit+mpi")
# depend only on spiral-software, but spiral-software must be installed with variants:
diff --git a/var/spack/repos/builtin/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py
index 0508410e89..2e489bd3a2 100644
--- a/var/spack/repos/builtin/packages/julia/package.py
+++ b/var/spack/repos/builtin/packages/julia/package.py
@@ -53,8 +53,9 @@ class Julia(MakefilePackage):
version("1.6.5", sha256="b70ae299ff6b63a9e9cbf697147a48a31b4639476d1947cb52e4201e444f23cb")
version("1.6.4", sha256="a4aa921030250f58015201e28204bff604a007defc5a379a608723e6bb1808d4")
- depends_on("c", type="build") # generated
- depends_on("cxx", type="build") # generated
+ depends_on("c", type="build")
+ depends_on("cxx", type="build")
+ depends_on("fortran", type="build")
variant("precompile", default=True, description="Improve julia startup time")
variant("openlibm", default=True, description="Use openlibm instead of libm")
diff --git a/var/spack/repos/builtin/packages/lua-sol2/package.py b/var/spack/repos/builtin/packages/lua-sol2/package.py
index 31d0367ffa..cf7aa3ee91 100644
--- a/var/spack/repos/builtin/packages/lua-sol2/package.py
+++ b/var/spack/repos/builtin/packages/lua-sol2/package.py
@@ -26,7 +26,8 @@ class LuaSol2(CMakePackage):
version("3.0.3", sha256="bf089e50387edfc70063e24fd7fbb693cceba4a50147d864fabedd1b33483582")
version("3.0.2", sha256="3f5f369eae6732ae9a315fe4370bbdc9900d2f2f4f291206aeb5b2d5533f0c99")
- depends_on("cxx", type="build") # generated
+ depends_on("c", type="build")
+ depends_on("cxx", type="build")
# Lua is not needed when building, since sol2 is headers-only
depends_on("lua", type=("link", "run"))
diff --git a/var/spack/repos/builtin/packages/opencl-clhpp/package.py b/var/spack/repos/builtin/packages/opencl-clhpp/package.py
index c580b96677..4ecdb12157 100644
--- a/var/spack/repos/builtin/packages/opencl-clhpp/package.py
+++ b/var/spack/repos/builtin/packages/opencl-clhpp/package.py
@@ -27,7 +27,8 @@ class OpenclClhpp(CMakePackage):
version("2.0.10", sha256="fa27456295c3fa534ce824eb0314190a8b3ebd3ba4d93a0b1270fc65bf378f2b")
version("2.0.9", sha256="ba8ac4977650d833804f208a1b0c198006c65c5eac7c83b25dc32cea6199f58c")
- depends_on("cxx", type="build") # generated
+ depends_on("c", type="build")
+ depends_on("cxx", type="build")
root_cmakelists_dir = "include"
diff --git a/var/spack/repos/builtin/packages/pagmo2/package.py b/var/spack/repos/builtin/packages/pagmo2/package.py
index 527314c700..d8569ac811 100644
--- a/var/spack/repos/builtin/packages/pagmo2/package.py
+++ b/var/spack/repos/builtin/packages/pagmo2/package.py
@@ -22,7 +22,8 @@ class Pagmo2(CMakePackage):
version("master", branch="master")
version("2.18.0", sha256="5ad40bf3aa91857a808d6b632d9e1020341a33f1a4115d7a2b78b78fd063ae31")
- depends_on("cxx", type="build") # generated
+ depends_on("c", type="build")
+ depends_on("cxx", type="build")
depends_on("boost+system+serialization+thread")
depends_on("intel-tbb")
diff --git a/var/spack/repos/builtin/packages/pdt/package.py b/var/spack/repos/builtin/packages/pdt/package.py
index d4784cb6ed..30d2fadfaf 100644
--- a/var/spack/repos/builtin/packages/pdt/package.py
+++ b/var/spack/repos/builtin/packages/pdt/package.py
@@ -38,7 +38,8 @@ class Pdt(AutotoolsPackage):
version("3.19", sha256="d57234077e2e999f2acf9860ea84369a4694b50cc17fa6728e5255dc5f4a2160")
version("3.18.1", sha256="d06c2d1793fadebf169752511e5046d7e02cf3fead6135a35c34b1fee6d6d3b2")
- depends_on("cxx", type="build") # generated
+ depends_on("c", type="build")
+ depends_on("cxx", type="build")
variant("pic", default=False, description="Builds with pic")
@@ -50,21 +51,21 @@ class Pdt(AutotoolsPackage):
filter_file(r"PDT_GXX=g\+\+ ", r"PDT_GXX=clang++ ", "ductape/Makefile")
def configure(self, spec, prefix):
- options = ["-prefix=%s" % prefix]
- if self.compiler.name == "xl":
+ options = [f"-prefix={prefix}"]
+ if spec.satisfies("%xl"):
options.append("-XLC")
- elif self.compiler.name == "intel":
+ elif spec.satisfies("%intel"):
options.append("-icpc")
- elif self.compiler.name == "oneapi":
+ elif spec.satisfies("%oneapi"):
if spec.satisfies("@3.25.2:"):
options.append("-icpx")
else:
options.append("-icpc")
- elif self.compiler.name == "gcc":
+ elif spec.satisfies("%gcc"):
options.append("-GNU")
- elif self.compiler.name in ["clang", "apple-clang", "aocc"]:
+ elif spec.satisfies("%clang") or spec.satisfies("%apple-clang") or spec.satisfies("%aocc"):
options.append("-clang")
- elif self.compiler.name == "cce":
+ elif spec.satisfies("%cce"):
options.append("-CC")
else:
raise InstallError("Unknown/unsupported compiler family: " + self.compiler.name)
diff --git a/var/spack/repos/builtin/packages/py-blosc2/package.py b/var/spack/repos/builtin/packages/py-blosc2/package.py
index d852742cc4..d8b08dd868 100644
--- a/var/spack/repos/builtin/packages/py-blosc2/package.py
+++ b/var/spack/repos/builtin/packages/py-blosc2/package.py
@@ -22,6 +22,7 @@ class PyBlosc2(PythonPackage):
version("2.0.0", sha256="f19b0b3674f6c825b490f00d8264b0c540c2cdc11ec7e81178d38b83c57790a1")
depends_on("c", type="build")
+ depends_on("cxx", type="build")
depends_on("python@3.9:3", when="@2.2:", type=("build", "link", "run"))
depends_on("python@3.8:3", when="@2.0", type=("build", "link", "run"))
diff --git a/var/spack/repos/builtin/packages/pygmo/package.py b/var/spack/repos/builtin/packages/pygmo/package.py
index bd04f292aa..9f26a46160 100644
--- a/var/spack/repos/builtin/packages/pygmo/package.py
+++ b/var/spack/repos/builtin/packages/pygmo/package.py
@@ -21,7 +21,8 @@ class Pygmo(CMakePackage):
version("master", branch="master")
version("2.18.0", sha256="9f081cc973297894af09f713f889870ac452bfb32b471f9f7ba08a5e0bb9a125")
- depends_on("cxx", type="build") # generated
+ depends_on("c", type="build")
+ depends_on("cxx", type="build")
variant("shared", default=True, description="Build shared libraries")
diff --git a/var/spack/repos/builtin/packages/rocprofiler-register/package.py b/var/spack/repos/builtin/packages/rocprofiler-register/package.py
index 38471a1605..2dab5a0d0a 100644
--- a/var/spack/repos/builtin/packages/rocprofiler-register/package.py
+++ b/var/spack/repos/builtin/packages/rocprofiler-register/package.py
@@ -26,6 +26,7 @@ class RocprofilerRegister(CMakePackage):
version("6.1.1", sha256="38242443d9147a04d61374de4cecee686578a3140fed17e88480f564a1f67cc7")
version("6.1.0", sha256="c6e60447ea2ccca8d6acd8758ac00037347892b16b450e1f99ddd04cc4b6cac1")
+ depends_on("c", type="build")
depends_on("cxx", type="build")
depends_on("fmt")
depends_on("glog")
diff --git a/var/spack/repos/builtin/packages/voropp/package.py b/var/spack/repos/builtin/packages/voropp/package.py
index 49a1aa078e..e9c358b513 100644
--- a/var/spack/repos/builtin/packages/voropp/package.py
+++ b/var/spack/repos/builtin/packages/voropp/package.py
@@ -22,7 +22,8 @@ class Voropp(CMakePackage):
version("master", branch="master")
version("0.4.6", sha256="ef7970071ee2ce3800daa8723649ca069dc4c71cc25f0f7d22552387f3ea437e")
- depends_on("cxx", type="build") # generated
+ depends_on("c", type="build")
+ depends_on("cxx", type="build")
patch("voro++-0.4.6-cmake.patch", when="@0.4.6")
diff --git a/var/spack/repos/builtin/packages/warpx/package.py b/var/spack/repos/builtin/packages/warpx/package.py
index 82a8610c4f..906c495d3a 100644
--- a/var/spack/repos/builtin/packages/warpx/package.py
+++ b/var/spack/repos/builtin/packages/warpx/package.py
@@ -243,6 +243,7 @@ class Warpx(CMakePackage, PythonExtension):
variant("shared", default=True, description="Build a shared version of the library")
variant("tprof", default=True, description="Enable tiny profiling features")
+ depends_on("c", type="build")
depends_on("cxx", type="build")
for v in ["24.10", "24.08", "develop"]: