Skip to content

Commit

Permalink
Add further missing C, C++ dependencies to packages (spack#47662)
Browse files Browse the repository at this point in the history
  • Loading branch information
alalazo authored Nov 21, 2024
1 parent fe746bd commit 5fd12b7
Show file tree
Hide file tree
Showing 25 changed files with 48 additions and 27 deletions.
2 changes: 1 addition & 1 deletion var/spack/repos/builtin/packages/arborx/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class Arborx(CMakePackage, CudaPackage, ROCmPackage):
deprecated=True,
)

depends_on("cxx", type="build") # generated
depends_on("cxx", type="build")

# Allowed C++ standard
variant(
Expand Down
1 change: 1 addition & 0 deletions var/spack/repos/builtin/packages/asio/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ class Asio(AutotoolsPackage):
version("1.16.1", sha256="e40bbd531530f08318b7c7d7e84e457176d8eae6f5ad2e3714dc27b9131ecd35")
version("1.16.0", sha256="c87410ea62de6245aa239b9ed2057edf01d7f66acc3f5e50add9a29343c87512")

depends_on("c", type="build")
depends_on("cxx", type="build")

depends_on("autoconf", type="build")
Expand Down
3 changes: 2 additions & 1 deletion var/spack/repos/builtin/packages/cgal/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ class Cgal(CMakePackage):
version("4.7", sha256="50bd0a1cad7a8957b09012f831eebaf7d670e2a3467e8f365ec0c71fa5436369")
version("4.6.3", sha256="e338027b8767c0a7a6e4fd8679182d1b83b5b1a0da0a1fe4546e7c0ca094fc21")

depends_on("cxx", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")

# @5: is header only and doesn't build shared libs
variant(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ class DlaFutureFortran(CMakePackage):
version("0.2.0", sha256="7fd3e1779c111b35f0d2701a024398b4f6e8dea4af523b6c8617d28c0b7ae61a")
version("0.1.0", sha256="9fd8a105cbb2f3e1daf8a49910f98fce68ca0b954773dba98a91464cf2e7c1da")

depends_on("fortran", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")
depends_on("fortran", type="build")

variant("shared", default=True, description="Build shared libraries.")
variant("test", default=False, description="Build tests.")
Expand Down
3 changes: 2 additions & 1 deletion var/spack/repos/builtin/packages/er/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ class Er(CMakePackage):
version("0.0.4", sha256="c456d34719bb57774adf6d7bc2fa9917ecb4a9de442091023c931a2cb83dfd37")
version("0.0.3", sha256="243b2b46ea274e17417ef5873c3ed7ba16dacdfdaf7053d1de5434e300de796b")

depends_on("c", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")

depends_on("mpi")
depends_on("kvtree+mpi")
Expand Down
3 changes: 2 additions & 1 deletion var/spack/repos/builtin/packages/fides/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ class Fides(CMakePackage):
version("1.1.0", sha256="40d2e08b8d5cfdfc809eae6ed2ae0731108ce3b1383485f4934a5ec8aaa9425e")
version("1.0.0", sha256="c355fdb4ca3790c1fa9a4491a0d294b8f883b6946c540ad9e5633c9fd8c8c3aa")

depends_on("cxx", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")
variant("mpi", default=True, description="build mpi support")

# Certain CMake versions have been found to break for our use cases
Expand Down
5 changes: 2 additions & 3 deletions var/spack/repos/builtin/packages/gcc/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,8 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage, CompilerPackage):
version("4.6.4", sha256="35af16afa0b67af9b8eb15cafb76d2bc5f568540552522f5dc2c88dd45d977e8")
version("4.5.4", sha256="eef3f0456db8c3d992cbb51d5d32558190bc14f3bc19383dd93acc27acc6befc")

depends_on("c", type="build") # generated
depends_on("cxx", type="build") # generated
depends_on("fortran", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")

# We specifically do not add 'all' variant here because:
# (i) Ada, D, Go, Jit, and Objective-C++ are not default languages.
Expand Down
2 changes: 1 addition & 1 deletion var/spack/repos/builtin/packages/gmake/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Gmake(Package, GNUMirrorPackage):
sha256="fc42139fb0d4b4291929788ebaf77e2a4de7eaca95e31f3634ef7d4932051f69",
)

depends_on("c", type="build") # generated
depends_on("c", type="build")

variant("guile", default=False, description="Support GNU Guile for embedded scripting")

Expand Down
5 changes: 1 addition & 4 deletions var/spack/repos/builtin/packages/hdf5/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ class Hdf5(CMakePackage):

license("custom")

depends_on("c", type="build")
depends_on("cxx", type="build", when="+cxx")
depends_on("fortran", type="build", when="+fortran")

Expand Down Expand Up @@ -109,10 +110,6 @@ class Hdf5(CMakePackage):
version("1.8.12", sha256="b5cccea850096962b5fd9e96f22c4f47d2379224bb41130d9bc038bb6c37dfcb")
version("1.8.10", sha256="4813b79c5fb8701a625b9924b8203bc7154a77f9b826ad4e034144b4056a160a")

depends_on("c", type="build") # generated
depends_on("cxx", type="build") # generated
depends_on("fortran", type="build") # generated

variant("shared", default=True, description="Builds a shared version of the library")

variant("hl", default=False, description="Enable the high-level library")
Expand Down
3 changes: 2 additions & 1 deletion var/spack/repos/builtin/packages/libgff/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ class Libgff(CMakePackage):

version("2.0.0", sha256="7656b19459a7ca7d2fd0fcec4f2e0fd0deec1b4f39c703a114e8f4c22d82a99c")

depends_on("cxx", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")
2 changes: 1 addition & 1 deletion var/spack/repos/builtin/packages/libxml2/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def url_for_version(self, version):
version("2.9.2", sha256="5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc")
version("2.7.8", sha256="cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec")

depends_on("c", type="build") # generated
depends_on("c", type="build")

variant("python", default=False, description="Enable Python support")
variant("shared", default=True, description="Build shared library")
Expand Down
3 changes: 2 additions & 1 deletion var/spack/repos/builtin/packages/mgard/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ class Mgard(CMakePackage, CudaPackage):
version("2021-11-12", commit="3c05c80a45a51bb6cc5fb5fffe7b1b16787d3366")
version("2020-10-01", commit="b67a0ac963587f190e106cc3c0b30773a9455f7a")

depends_on("cxx", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")

variant(
"serial",
Expand Down
3 changes: 2 additions & 1 deletion var/spack/repos/builtin/packages/mpifileutils/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ class Mpifileutils(CMakePackage):
version("0.9.1", sha256="15a22450f86b15e7dc4730950b880fda3ef6f59ac82af0b268674d272aa61c69")
version("0.9", sha256="1b8250af01aae91c985ca5d61521bfaa4564e46efa15cee65cd0f82cf5a2bcfb")

depends_on("c", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")

variant("xattr", default=True, description="Enable code for extended attributes")
variant("lustre", default=False, description="Enable optimizations and features for Lustre")
Expand Down
3 changes: 2 additions & 1 deletion var/spack/repos/builtin/packages/nccmp/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ class Nccmp(CMakePackage):
version("1.8.9.0", sha256="da5d2b4dcd52aec96e7d96ba4d0e97efebbd40fe9e640535e5ee3d5cd082ae50")
version("1.8.2.0", sha256="7f5dad4e8670568a71f79d2bcebb08d95b875506d3d5faefafe1a8b3afa14f18")

depends_on("c", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")

depends_on("cmake@3.12:", type="build")
depends_on("netcdf-c", type=("build", "run"))
Expand Down
3 changes: 2 additions & 1 deletion var/spack/repos/builtin/packages/netcdf-cxx/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ class NetcdfCxx(AutotoolsPackage):

version("4.2", sha256="95ed6ab49a0ee001255eac4e44aacb5ca4ea96ba850c08337a3e4c9a0872ccd1")

depends_on("cxx", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")

depends_on("netcdf-c")

Expand Down
3 changes: 3 additions & 0 deletions var/spack/repos/builtin/packages/netcdf-cxx4/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ class NetcdfCxx4(CMakePackage):

filter_compiler_wrappers("ncxx4-config", relative_root="bin")

depends_on("c", type="build")
depends_on("cxx", type="build")

def flag_handler(self, name, flags):
if name == "cflags" and "+pic" in self.spec:
flags.append(self.compiler.cc_pic_flag)
Expand Down
3 changes: 2 additions & 1 deletion var/spack/repos/builtin/packages/openpmd-api/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ class OpenpmdApi(CMakePackage):
version("0.12.0", tag="0.12.0-alpha", commit="23be484dd2570b5277779eafcc5f1eb70c6d98f2")
version("0.11.1", tag="0.11.1-alpha", commit="c40292aafbf564807710424d106304f9670a8304")

depends_on("cxx", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")

variant("shared", default=True, description="Build a shared version of the library")
variant("mpi", default=True, description="Enable parallel I/O")
Expand Down
3 changes: 3 additions & 0 deletions var/spack/repos/builtin/packages/papyrus/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ class Papyrus(CMakePackage):

depends_on("mpi")

depends_on("c", type="build")
depends_on("cxx", type="build")

test_requires_compiler = True

def setup_run_environment(self, env):
Expand Down
1 change: 1 addition & 0 deletions var/spack/repos/builtin/packages/py-amrex/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ class PyAmrex(CMakePackage, PythonExtension, CudaPackage, ROCmPackage):

extends("python")

depends_on("c", type="build")
depends_on("cxx", type="build")

depends_on("cmake@3.20:3", type="build", when="@:24.08")
Expand Down
3 changes: 2 additions & 1 deletion var/spack/repos/builtin/packages/rocminfo/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ class Rocminfo(CMakePackage):
version("5.3.3", sha256="77e6adc81da6c1d153517e1d28db774205531a2ec188e6518f998328ef7897c6")
version("5.3.0", sha256="c279da1d946771d120611b64974fde751534e787a394ceb6b8e0b743c143d782")

depends_on("cxx", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")

depends_on("cmake@3:", type="build")

Expand Down
5 changes: 3 additions & 2 deletions var/spack/repos/builtin/packages/scotch/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ class Scotch(CMakePackage, MakefilePackage):
version("6.0.0", sha256="8206127d038bda868dda5c5a7f60ef8224f2e368298fbb01bf13fa250e378dd4")
version("5.1.10b", sha256="54c9e7fafefd49d8b2017d179d4f11a655abe10365961583baaddc4eeb6a9add")

depends_on("c", type="build") # generated
depends_on("fortran", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")
depends_on("fortran", type="build")

build_system(conditional("cmake", when="@7:"), "makefile", default="cmake")
variant("threads", default=True, description="use POSIX Pthreads within Scotch and PT-Scotch")
Expand Down
3 changes: 2 additions & 1 deletion var/spack/repos/builtin/packages/spiral-software/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ class SpiralSoftware(CMakePackage):
version("8.4.0", sha256="d0c58de65c678130eeee6b8b8b48061bbe463468990f66d9b452225ce46dee19")
version("8.3.0", sha256="41cf0e7f14f9497e98353baa1ef4ca6204ce5ca525db8093f5bb44e89992abdf")

depends_on("c", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")

extendable = True

Expand Down
1 change: 1 addition & 0 deletions var/spack/repos/builtin/packages/sz/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class Sz(CMakePackage, AutotoolsPackage):

depends_on("c", type="build")
depends_on("cxx", type="build")
depends_on("fortran", type="build", when="+fortran")

build_system(
conditional("autotools", when="@:2.1.8.0"),
Expand Down
5 changes: 3 additions & 2 deletions var/spack/repos/builtin/packages/xyce/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ class Xyce(CMakePackage):
deprecated=True,
)

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")

depends_on("cmake@3.22:", type="build")
depends_on("flex")
Expand Down
3 changes: 2 additions & 1 deletion var/spack/repos/builtin/packages/yaml-cpp/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ class YamlCpp(CMakePackage):
version("0.5.3", sha256="decc5beabb86e8ed9ebeb04358d5363a5c4f72d458b2c788cb2f3ac9c19467b2")
version("0.3.0", sha256="ab8d0e07aa14f10224ed6682065569761f363ec44bc36fcdb2946f6d38fe5a89")

depends_on("cxx", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")

variant("shared", default=True, description="Build shared instead of static libraries")
variant("pic", default=True, description="Build with position independent code")
Expand Down

0 comments on commit 5fd12b7

Please sign in to comment.