Skip to content

Commit 414481e

Browse files
committed
Fix compiler dependencies (build-time only) in new JEDI packages
1 parent 018b780 commit 414481e

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

configs/templates/neptune-dev/spack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ spack:
1212
- neptune-env +debug +openmp +espc +ncview ^esmf@=8.9.1
1313
- neptune-env ~debug ~openmp +espc +ncview ^esmf@=8.9.1
1414
- neptune-env +debug ~openmp +espc +ncview ^esmf@=8.9.1
15-
- neptune-python-env ^neptune-env ~debug +openmp +espc +ncview ^esmf@=8.9.1
15+
- neptune-python-env ^neptune-env ~debug +openmp +espc +ncview ^esmf@=8.9.1
1616
- jedi-neptune-env +adp +jedi ^neptune-env ~debug +openmp +espc +ncview ^esmf@=8.9.1
1717
1818

repos/spack_stack/spack_repo/spack_stack/packages/ioda/package.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ class Ioda(CMakePackage):
3333
generator("make")
3434

3535
# Project doesn't list "c" as a dependency in CMakeLists.txt, but cmake step fails w/o it
36-
depends_on("c")
37-
depends_on("cxx")
38-
depends_on("fortran")
36+
depends_on("c", type=("build"))
37+
depends_on("cxx", type=("build"))
38+
depends_on("fortran", type=("build"))
3939

4040
depends_on("[email protected]:")
4141
depends_on("bufr")

repos/spack_stack/spack_repo/spack_stack/packages/ioda_converters/package.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class IodaConverters(CMakePackage):
2222
generator("make")
2323

2424
# Project doesn't list "c" as a dependency in CMakeLists.txt, but cmake step fails w/o it
25-
depends_on("c")
26-
depends_on("cxx")
27-
depends_on("fortran")
25+
depends_on("c", type=("build"))
26+
depends_on("cxx", type=("build"))
27+
depends_on("fortran", type=("build"))
2828

2929
extends("python")
3030

repos/spack_stack/spack_repo/spack_stack/packages/jedi_neptune_env/package.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class JediNeptuneEnv(BundlePackage):
3232

3333
with when("+jedi"):
3434
depends_on("oops", type="run")
35+
# DOES THIS INCLUDE THE ONEAPI IFX OPENMP BUG FIX? DH* TODO
3536
depends_on("[email protected]", type="run")
3637
depends_on("ioda", type="run")
3738
depends_on("ioda-converters", type="run")

repos/spack_stack/spack_repo/spack_stack/packages/oops/package.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ class Oops(CMakePackage):
3232
generator("make")
3333

3434
# Project doesn't list "c" as a dependency in CMakeLists.txt, but cmake step fails w/o it
35-
depends_on("c")
36-
depends_on("cxx")
37-
depends_on("fortran")
35+
depends_on("c", type="build")
36+
depends_on("cxx", type="build")
37+
depends_on("fortran", type="build")
3838

3939
depends_on("[email protected]:")
4040
depends_on("cmake", type=("build"))

repos/spack_stack/spack_repo/spack_stack/packages/ropp_ufo/package.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ class RoppUfo(CMakePackage):
2222
version("11.0.20260120", commit="02e21ef0696e67675184797427af265c06973ecf", submodules=True)
2323

2424
# Project doesn't list "c" as a dependency in CMakeLists.txt, but cmake step fails w/o it
25-
depends_on("c")
26-
depends_on("fortran")
25+
depends_on("c", type=("build"))
26+
depends_on("fortran", type=("build"))
2727

2828
depends_on("cmake", type=("build"))
2929
depends_on("[email protected]:", type=("build"), when="@11:")

repos/spack_stack/spack_repo/spack_stack/packages/ufo/package.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,10 @@ class Ufo(CMakePackage):
4747
conflicts("+oasim", msg="UFO: OASIM to be implemented.")
4848
conflicts("+rttov", msg="UFO: RTTOV to be implemented.")
4949

50-
# DH* TODO UPDATE
5150
# Project doesn't list "c" as a dependency in CMakeLists.txt, but cmake step fails w/o it
52-
depends_on("c")
53-
depends_on("cxx")
54-
depends_on("fortran")
51+
depends_on("c", type=("build"))
52+
depends_on("cxx", type=("build"))
53+
depends_on("fortran", type=("build"))
5554

5655
# DH* TODO FIX THIS
5756
# -- Download test data from https://bin.ssec.wisc.edu/pub/s4/CRTM/file/crtm_coefficients_2.4.1_skylab_4.0.tar.gz

0 commit comments

Comments
 (0)