From f0f463c8dc842e7830d34760a9903d1a78789358 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Wed, 12 Feb 2025 17:51:23 +0100 Subject: [PATCH] hep: add missing language dependencies (#48963) * highfive: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14989283 * lhapdf: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14989283 * vc: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14989140 * davix: add dependency on C, C++ https://gitlab.spack.io/spack/spack/-/jobs/14989131 * pandorasdk: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14989130 * veccore: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14989118 * pythia6: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14989116 * jwt-cpp: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14989115 * collier: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14989115 * hepmc: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14989112 * clhep: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14989075 * fastjet: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14981340 * gosam-contrib: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14978873 * thepeg: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14997553 * cepgen: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14997552 * podio: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14997552 * pandoramonitoring: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14997552 * lcio: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14997513 * geant4: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14997202 * evtgen: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14996817 * apfel: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/14996779 * collier: add dependency on C, C++ https://gitlab.spack.io/spack/spack/-/jobs/14996770 * vecgeom: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/15003840 * dd4hep: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/15003839 * opendatadetector: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/15007666 * acts: add dependency on C https://gitlab.spack.io/spack/spack/-/jobs/15007827 * hepmc: remove dependency on fortran Co-authored-by: Seth R. Johnson * thepeg: remove fortran dep Co-authored-by: Wouter Deconinck * acts: add a conditional build dependency Co-authored-by: Wouter Deconinck * opendatadetector: add comment to explain C dep Co-authored-by: Wouter Deconinck --------- Co-authored-by: Seth R. Johnson Co-authored-by: Wouter Deconinck --- var/spack/repos/builtin/packages/acts/package.py | 3 ++- var/spack/repos/builtin/packages/apfel/package.py | 1 + .../repos/builtin/packages/cepgen/package.py | 5 +++-- var/spack/repos/builtin/packages/clhep/package.py | 3 ++- .../repos/builtin/packages/collier/package.py | 4 +++- var/spack/repos/builtin/packages/davix/package.py | 15 +++++++-------- .../repos/builtin/packages/dd4hep/package.py | 3 ++- .../repos/builtin/packages/evtgen/package.py | 3 ++- .../repos/builtin/packages/fastjet/package.py | 1 + .../repos/builtin/packages/geant4/package.py | 1 + .../builtin/packages/gosam-contrib/package.py | 5 +++-- var/spack/repos/builtin/packages/hepmc/package.py | 4 ++-- .../repos/builtin/packages/highfive/package.py | 14 +++++++------- .../repos/builtin/packages/jwt-cpp/package.py | 3 ++- var/spack/repos/builtin/packages/lcio/package.py | 3 ++- .../repos/builtin/packages/lhapdf/package.py | 5 +++-- .../builtin/packages/opendatadetector/package.py | 3 ++- .../builtin/packages/pandoramonitoring/package.py | 3 ++- .../repos/builtin/packages/pandorasdk/package.py | 3 ++- var/spack/repos/builtin/packages/podio/package.py | 3 ++- .../repos/builtin/packages/pythia6/package.py | 3 ++- .../repos/builtin/packages/thepeg/package.py | 4 +++- var/spack/repos/builtin/packages/vc/package.py | 3 ++- .../repos/builtin/packages/veccore/package.py | 1 + .../repos/builtin/packages/vecgeom/package.py | 1 + 25 files changed, 60 insertions(+), 37 deletions(-) diff --git a/var/spack/repos/builtin/packages/acts/package.py b/var/spack/repos/builtin/packages/acts/package.py index e9a128a486a..3aa72cb3abf 100644 --- a/var/spack/repos/builtin/packages/acts/package.py +++ b/var/spack/repos/builtin/packages/acts/package.py @@ -194,7 +194,8 @@ class Acts(CMakePackage, CudaPackage): version("0.08.1", commit="289bdcc320f0b3ff1d792e29e462ec2d3ea15df6") version("0.08.0", commit="99eedb38f305e3a1cd99d9b4473241b7cd641fa9") - depends_on("cxx", type="build") # generated + depends_on("c", type="build", when="+dd4hep") # DD4hep requires C + depends_on("cxx", type="build") # Variants that affect the core Acts library variant( diff --git a/var/spack/repos/builtin/packages/apfel/package.py b/var/spack/repos/builtin/packages/apfel/package.py index 1bb9f6167d2..b229f31ef46 100644 --- a/var/spack/repos/builtin/packages/apfel/package.py +++ b/var/spack/repos/builtin/packages/apfel/package.py @@ -27,6 +27,7 @@ class Apfel(AutotoolsPackage, CMakePackage): version("3.0.6", sha256="7063c9eee457e030b97926ac166cdaedd84625b31397e1dfd01ae47371fb9f61") version("3.0.4", sha256="c7bfae7fe2dc0185981850f2fe6ae4842749339d064c25bf525b4ef412bbb224") + depends_on("c", type="build") depends_on("cxx", type="build") depends_on("fortran", type="build") diff --git a/var/spack/repos/builtin/packages/cepgen/package.py b/var/spack/repos/builtin/packages/cepgen/package.py index 7ac3b8431d7..548568cd893 100644 --- a/var/spack/repos/builtin/packages/cepgen/package.py +++ b/var/spack/repos/builtin/packages/cepgen/package.py @@ -21,8 +21,9 @@ class Cepgen(CMakePackage): "1.0.2patch1", sha256="333bba0cb1965a98dec127e00c150eab1a515cd348a90f7b1d66d5cd8d206d21" ) - depends_on("cxx", type="build") # generated - depends_on("fortran", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") + depends_on("fortran", type="build") generator("ninja") diff --git a/var/spack/repos/builtin/packages/clhep/package.py b/var/spack/repos/builtin/packages/clhep/package.py index 92f7751356e..f2a020169d1 100644 --- a/var/spack/repos/builtin/packages/clhep/package.py +++ b/var/spack/repos/builtin/packages/clhep/package.py @@ -52,7 +52,8 @@ class Clhep(CMakePackage): version("2.2.0.4", sha256="9bf7fcd9892313c8d1436bc4a4a285a016c4f8e81e1fc65bdf6783207ae57550") version("2.1.2.3", sha256="4353231be09c134507092161cd3ced27a065ca0ebb31ee0256e60a8163c47c3b") - depends_on("cxx", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") variant( "cxxstd", diff --git a/var/spack/repos/builtin/packages/collier/package.py b/var/spack/repos/builtin/packages/collier/package.py index 4fe6ba33f72..45f53fd81c7 100644 --- a/var/spack/repos/builtin/packages/collier/package.py +++ b/var/spack/repos/builtin/packages/collier/package.py @@ -31,7 +31,9 @@ class Collier(CMakePackage): version("1.1", sha256="80fd54e2c30029d3d7d646738ae9469ad3a6f5ea7aa1179b951030df048e36bc") version("1.0", sha256="54f40c1ed07a6829230af400abfe48791e74e56eac2709c0947cec3410a4473d") - depends_on("fortran", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") + depends_on("fortran", type="build") @property def parallel(self): diff --git a/var/spack/repos/builtin/packages/davix/package.py b/var/spack/repos/builtin/packages/davix/package.py index 80e7a05ee3d..4eb9a2c33a3 100644 --- a/var/spack/repos/builtin/packages/davix/package.py +++ b/var/spack/repos/builtin/packages/davix/package.py @@ -57,6 +57,9 @@ class Davix(CMakePackage): description="Use the specified C++ standard when building.", ) + depends_on("c", type="build") + depends_on("cxx", type="build") + depends_on("pkgconfig", type="build") depends_on("libxml2") depends_on("uuid") @@ -68,14 +71,10 @@ class Davix(CMakePackage): depends_on("gsoap", when="+thirdparty") def cmake_args(self): - cmake_args = [ + return [ self.define_from_variant("CMAKE_CXX_STANDARD", variant="cxxstd"), self.define_from_variant("ENABLE_THIRD_PARTY_COPY", variant="thirdparty"), + # Disable the use of embedded packages; use Spack to fetch them instead + self.define("EMBEDDED_LIBCURL", False), + self.define("CMAKE_MACOSX_RPATH", self.spec.satisfies("platform=darwin")), ] - - # Disable the use of embedded packages; use Spack to fetch them instead. - cmake_args.append("-DEMBEDDED_LIBCURL=OFF") - - if "darwin" in self.spec.architecture: - cmake_args.append("-DCMAKE_MACOSX_RPATH=ON") - return cmake_args diff --git a/var/spack/repos/builtin/packages/dd4hep/package.py b/var/spack/repos/builtin/packages/dd4hep/package.py index cf7ec12ea20..877638e56d8 100644 --- a/var/spack/repos/builtin/packages/dd4hep/package.py +++ b/var/spack/repos/builtin/packages/dd4hep/package.py @@ -47,7 +47,8 @@ class Dd4hep(CMakePackage): version("1.17", sha256="036a9908aaf1e13eaf5f2f43b6f5f4a8bdda8183ddc5befa77a4448dbb485826") version("1.16.1", sha256="c8b1312aa88283986f89cc008d317b3476027fd146fdb586f9f1fbbb47763f1a") - depends_on("cxx", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") generator("ninja") diff --git a/var/spack/repos/builtin/packages/evtgen/package.py b/var/spack/repos/builtin/packages/evtgen/package.py index 5d9afa2b772..dcb2d70f366 100644 --- a/var/spack/repos/builtin/packages/evtgen/package.py +++ b/var/spack/repos/builtin/packages/evtgen/package.py @@ -22,7 +22,8 @@ class Evtgen(CMakePackage): version("02.02.00", sha256="0c626e51cb17e799ad0ffd0beea5cb94d7ac8a5f8777b746aa1944dd26071ecf") version("02.00.00", sha256="02372308e1261b8369d10538a3aa65fe60728ab343fcb64b224dac7313deb719") - depends_on("cxx", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") variant("pythia8", default=True, description="Build with pythia8") variant("tauola", default=False, description="Build with tauola") diff --git a/var/spack/repos/builtin/packages/fastjet/package.py b/var/spack/repos/builtin/packages/fastjet/package.py index 69bf54b93b1..2e2f3b462f0 100644 --- a/var/spack/repos/builtin/packages/fastjet/package.py +++ b/var/spack/repos/builtin/packages/fastjet/package.py @@ -59,6 +59,7 @@ class Fastjet(AutotoolsPackage): version("2.3.0", sha256="e452fe4a9716627bcdb726cfb0917f46a7ac31f6006330a6ccc1abc43d9c2d53") # older version use .tar instead of .tar.gz extension, to be added + depends_on("c", type="build") depends_on("cxx", type="build") depends_on("fortran", type="build", when="plugins=all") depends_on("fortran", type="build", when="plugins=pxcone") diff --git a/var/spack/repos/builtin/packages/geant4/package.py b/var/spack/repos/builtin/packages/geant4/package.py index 65926854746..ec2b05c34ca 100644 --- a/var/spack/repos/builtin/packages/geant4/package.py +++ b/var/spack/repos/builtin/packages/geant4/package.py @@ -49,6 +49,7 @@ class Geant4(CMakePackage): version("10.3.3", sha256="bcd36a453da44de9368d1d61b0144031a58e4b43a6d2d875e19085f2700a89d8") version("10.0.4", sha256="97f3744366b00143d1eed52f8786823034bbe523f45998106f798af61d83f863") + depends_on("c", type="build") depends_on("cxx", type="build") _cxxstd_values = ( diff --git a/var/spack/repos/builtin/packages/gosam-contrib/package.py b/var/spack/repos/builtin/packages/gosam-contrib/package.py index f7768c04f5d..87059d7ce12 100644 --- a/var/spack/repos/builtin/packages/gosam-contrib/package.py +++ b/var/spack/repos/builtin/packages/gosam-contrib/package.py @@ -16,8 +16,9 @@ class GosamContrib(AutotoolsPackage): version("2.0", sha256="c05beceea74324eb51c1049773095e2cb0c09c8c909093ee913d8b0da659048d") version("1.0", sha256="a29d4232d9190710246abc2ed97fdcd8790ce83580f56a360f3456b0377c40ec") - depends_on("cxx", type="build") # generated - depends_on("fortran", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") + depends_on("fortran", type="build") # whizard checks for .la files ( but does not use them ) install_libtool_archives = True diff --git a/var/spack/repos/builtin/packages/hepmc/package.py b/var/spack/repos/builtin/packages/hepmc/package.py index 9e5167e3364..e0871e2a139 100644 --- a/var/spack/repos/builtin/packages/hepmc/package.py +++ b/var/spack/repos/builtin/packages/hepmc/package.py @@ -25,8 +25,8 @@ class Hepmc(CMakePackage): version("2.06.06", sha256="8cdff26c10783ed4248220a84a43b7e1f9b59cc2c9a29bd634d024ca469db125") version("2.06.05", sha256="4c411077cc97522c03b74f973264b8d9fd2b6ccec0efc7ceced2645371c73618") - depends_on("cxx", type="build") # generated - depends_on("fortran", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") variant("length", default="MM", values=("CM", "MM"), multi=False, description="Unit of length") variant( diff --git a/var/spack/repos/builtin/packages/highfive/package.py b/var/spack/repos/builtin/packages/highfive/package.py index d539f67b64e..3041df95a09 100644 --- a/var/spack/repos/builtin/packages/highfive/package.py +++ b/var/spack/repos/builtin/packages/highfive/package.py @@ -42,7 +42,8 @@ class Highfive(CMakePackage): version("1.1", sha256="430fc312fc1961605ffadbfad82b9753a5e59482e9fbc64425fb2c184123d395") version("1.0", sha256="d867fe73d00817f686d286f3c69a23731c962c3e2496ca1657ea7302cd0bb944") - depends_on("cxx", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") variant("boost", default=False, description="Support Boost") variant("mpi", default=True, description="Support MPI") @@ -57,10 +58,9 @@ class Highfive(CMakePackage): depends_on("hdf5 +mpi", when="+mpi") def cmake_args(self): - args = [ - "-DUSE_BOOST:Bool={0}".format(self.spec.satisfies("+boost")), - "-DHIGHFIVE_PARALLEL_HDF5:Bool={0}".format(self.spec.satisfies("+mpi")), - "-DHIGHFIVE_UNIT_TESTS:Bool=false", - "-DHIGHFIVE_EXAMPLES:Bool=false", + return [ + self.define_from_variant("USE_BOOST", "boost"), + self.define_from_variant("HIGHFIVE_PARALLEL_HDF5", "mpi"), + self.define("HIGHFIVE_UNIT_TESTS", False), + self.define("HIGHFIVE_EXAMPLES", False), ] - return args diff --git a/var/spack/repos/builtin/packages/jwt-cpp/package.py b/var/spack/repos/builtin/packages/jwt-cpp/package.py index 48a1857331c..0b611c1d51c 100644 --- a/var/spack/repos/builtin/packages/jwt-cpp/package.py +++ b/var/spack/repos/builtin/packages/jwt-cpp/package.py @@ -22,7 +22,8 @@ class JwtCpp(CMakePackage): version("0.5.0", sha256="079a273f070dd11213e301712319a65881e51ab81535cc436d5313191df852a2") version("0.4.0", sha256="f0dcc7b0e8bef8f9c3f434e7121f9941145042c9fe3055a5bdd709085a4f2be4") - depends_on("cxx", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") # TODO: jwt-cpp>=0.5.0 has an embedded copy of picojson which can be packaged seperately diff --git a/var/spack/repos/builtin/packages/lcio/package.py b/var/spack/repos/builtin/packages/lcio/package.py index 654636bba84..babd9ffef19 100644 --- a/var/spack/repos/builtin/packages/lcio/package.py +++ b/var/spack/repos/builtin/packages/lcio/package.py @@ -48,7 +48,8 @@ class Lcio(CMakePackage): version("2.13.2", sha256="9f153ba13e56ee16795378f9192678d40df1faca51d00aaa8fb80547bfecb8d8") version("2.13.1", sha256="aa572e2ba38c0cadd6a92fa933c3ed97e21d016c7982578d3f293901169f4ec0") - depends_on("cxx", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") variant( "cxxstd", diff --git a/var/spack/repos/builtin/packages/lhapdf/package.py b/var/spack/repos/builtin/packages/lhapdf/package.py index f378829d521..df696997bc7 100644 --- a/var/spack/repos/builtin/packages/lhapdf/package.py +++ b/var/spack/repos/builtin/packages/lhapdf/package.py @@ -31,8 +31,9 @@ class Lhapdf(AutotoolsPackage): version("6.3.0", sha256="864468439c7662bbceed6c61c7132682ec83381a23c9c9920502fdd7329dd816") version("6.2.3", sha256="37200a1ab70247250a141dfed7419d178f9a83bd23a4f8a38e203d4e27b41308") - depends_on("cxx", type="build") # generated - depends_on("fortran", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") + depends_on("fortran", type="build") variant("python", default=True, description="Build python bindings") diff --git a/var/spack/repos/builtin/packages/opendatadetector/package.py b/var/spack/repos/builtin/packages/opendatadetector/package.py index 8ca314331b7..f2c03e60ecf 100644 --- a/var/spack/repos/builtin/packages/opendatadetector/package.py +++ b/var/spack/repos/builtin/packages/opendatadetector/package.py @@ -23,7 +23,8 @@ class Opendatadetector(CMakePackage): version("v2", tag="v2", commit="7041ae086dff4ee4a8d5b65f5d9559acc6dbec47") version("v1", tag="v1", commit="81c43c6511723c13c15327479082d3dcfa1947c7") - depends_on("cxx", type="build") # generated + depends_on("c", type="build") # because of DD4hep + depends_on("cxx", type="build") depends_on("dd4hep") depends_on("root") diff --git a/var/spack/repos/builtin/packages/pandoramonitoring/package.py b/var/spack/repos/builtin/packages/pandoramonitoring/package.py index d5cf0514ca5..4519763a7cd 100644 --- a/var/spack/repos/builtin/packages/pandoramonitoring/package.py +++ b/var/spack/repos/builtin/packages/pandoramonitoring/package.py @@ -21,7 +21,8 @@ class Pandoramonitoring(CMakePackage): version("master", branch="master") version("3.5.0", sha256="274562abb7c797194634d5460a56227444a1de07a240c88ae35ca806abcbaf60") - depends_on("cxx", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") depends_on("root@6.18.04: +x +opengl") depends_on("pandorasdk") diff --git a/var/spack/repos/builtin/packages/pandorasdk/package.py b/var/spack/repos/builtin/packages/pandorasdk/package.py index 2971edd0a65..becbf564f67 100644 --- a/var/spack/repos/builtin/packages/pandorasdk/package.py +++ b/var/spack/repos/builtin/packages/pandorasdk/package.py @@ -22,7 +22,8 @@ class Pandorasdk(CMakePackage): version("3.4.1", sha256="9607bf52a9d79d88d28c45d4f3336e066338b36ab81b4d2d125226f4ad3a7aaf") version("3.4.0", sha256="1e30db056d4a43f8659fccdda00270af14593425d933f91e91d5c97f1e124c6b") - depends_on("cxx", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") depends_on("pandorapfa") diff --git a/var/spack/repos/builtin/packages/podio/package.py b/var/spack/repos/builtin/packages/podio/package.py index fc9d8a62dd2..2d530bbcba2 100644 --- a/var/spack/repos/builtin/packages/podio/package.py +++ b/var/spack/repos/builtin/packages/podio/package.py @@ -70,7 +70,8 @@ class Podio(CMakePackage): deprecated=True, ) - depends_on("cxx", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") _cxxstd_values = (conditional("17", when="@:1.2"), conditional("20", when="@0.14.1:")) variant( diff --git a/var/spack/repos/builtin/packages/pythia6/package.py b/var/spack/repos/builtin/packages/pythia6/package.py index 63dd4b6e3f6..f446fbf71c1 100644 --- a/var/spack/repos/builtin/packages/pythia6/package.py +++ b/var/spack/repos/builtin/packages/pythia6/package.py @@ -40,7 +40,8 @@ class Pythia6(CMakePackage): sha256="01cbff47e99365b5e46f6d62c1735d3cae1932c4710604850d59f538cb758020", ) - depends_on("fortran", type="build") # generated + depends_on("c", type="build") + depends_on("fortran", type="build") # Root's TPythia6 interface requires extra sources to be built into # the Pythia6 library. diff --git a/var/spack/repos/builtin/packages/thepeg/package.py b/var/spack/repos/builtin/packages/thepeg/package.py index e80fc8cffee..feb1d7d257a 100644 --- a/var/spack/repos/builtin/packages/thepeg/package.py +++ b/var/spack/repos/builtin/packages/thepeg/package.py @@ -40,7 +40,6 @@ class Thepeg(AutotoolsPackage): version("1.9.0", sha256="3ee58e5e3a26184567df1b9a10ca70df228e86f322e72f018dd7d8d5a4700a5d") version("1.8.3", sha256="55ede3a3dd0bd07b90d0d49cf7ae28c18cd965780fdf53528508b97d57152fc7") - depends_on("cxx", type="build") # generated # version('1.8.2', sha256='44ccd0d70e42bb6ecd801a51bade6c25b3953c56f33017402d4f52ee6492dffa') # version('1.8.1', sha256='84c2a212a681545cddd541dca191eb65d96f41df86c87480b6f4f7d4f9683562') # version('1.8.0', sha256='4b22fda1078f410b999a23a17f611c9ae3a7f0f4cee4e83dc82c9336b7adf037') @@ -63,6 +62,9 @@ class Thepeg(AutotoolsPackage): force_autoreconf = True + depends_on("c", type="build") + depends_on("cxx", type="build") + depends_on("gsl") depends_on("lhapdf") depends_on("lhapdf@:6.2", when="@:1.9") diff --git a/var/spack/repos/builtin/packages/vc/package.py b/var/spack/repos/builtin/packages/vc/package.py index 83d1119b96c..638950c8a67 100644 --- a/var/spack/repos/builtin/packages/vc/package.py +++ b/var/spack/repos/builtin/packages/vc/package.py @@ -24,7 +24,8 @@ class Vc(CMakePackage): version("1.2.0", sha256="9cd7b6363bf40a89e8b1d2b39044b44a4ce3f1fd6672ef3fc45004198ba28a2b") version("1.1.0", sha256="281b4c6152fbda11a4b313a0a0ca18565ee049a86f35f672f1383967fef8f501") - depends_on("cxx", type="build") # generated + depends_on("c", type="build") + depends_on("cxx", type="build") depends_on("cmake@3.5:", type="build", when="@1.4.5:") diff --git a/var/spack/repos/builtin/packages/veccore/package.py b/var/spack/repos/builtin/packages/veccore/package.py index 4f885c6f367..a5e1d931b0e 100644 --- a/var/spack/repos/builtin/packages/veccore/package.py +++ b/var/spack/repos/builtin/packages/veccore/package.py @@ -34,6 +34,7 @@ class Veccore(CMakePackage): version("0.4.0", sha256="0a38b958c92647c30b5709d17edaf39d241b92b988f1040c0fbe24932b42927e") version("0.3.2", sha256="d72b03df00f5e94b2d07f78ab3af6d9d956c19e9a1fae07267b48f6fc8d7713f") + depends_on("c", type="build") depends_on("cxx", type="build") variant("vc", default=False, description="Enable Vc backend") diff --git a/var/spack/repos/builtin/packages/vecgeom/package.py b/var/spack/repos/builtin/packages/vecgeom/package.py index 769352b4b0c..06c0abecdb9 100644 --- a/var/spack/repos/builtin/packages/vecgeom/package.py +++ b/var/spack/repos/builtin/packages/vecgeom/package.py @@ -73,6 +73,7 @@ class Vecgeom(CMakePackage, CudaPackage): deprecated=True, ) + depends_on("c", type="build") depends_on("cxx", type="build") _cxxstd_values = (conditional("11", "14", when="@:1.1"), "17", conditional("20", when="@1.2:"))