From 6287d9845513c0f9458732c704e1ee34980f7db6 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 11 Sep 2024 10:08:52 -0600 Subject: Update FMS: apply patch for fms@2023.03, add variant shared and patch for fms@2024.02 (#46238) * Update var/spack/repos/builtin/packages/fms/package.py: apply patch for fms@2023.03 to fix compiler options bug in cmake config, add variant shared and corresponding patch for fms@2024.02 * Fix fms package audit: use https://github.com/NOAA-GFDL/FMS/commit/c9bba516ba1115d4a7660fba92f9d67cf3fd32ad.patch?full_index=1 instead of https://github.com/NOAA-GFDL/FMS/pull/1418/commits/c9bba516ba1115d4a7660fba92f9d67cf3fd32ad.patch?full_index=1 * Update checksum of patch for fms@2023.03 --- var/spack/repos/builtin/packages/fms/package.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/fms/package.py b/var/spack/repos/builtin/packages/fms/package.py index c546c315e3..59034e63d5 100644 --- a/var/spack/repos/builtin/packages/fms/package.py +++ b/var/spack/repos/builtin/packages/fms/package.py @@ -58,6 +58,22 @@ class Fms(CMakePackage): depends_on("c", type="build") # generated depends_on("fortran", type="build") # generated + # https://github.com/NOAA-GFDL/FMS/issues/1417 + patch( + "https://github.com/NOAA-GFDL/FMS/commit/c9bba516ba1115d4a7660fba92f9d67cf3fd32ad.patch?full_index=1", + sha256="07d5b68838bba61ee547bd4cd7c12d81228c91a80a966b8693694fa236d0ac30", + when="@2023.03", + ) + + variant("shared", description="Build shared libraries", when="@2024.02:", default=False) + # What the following patch is providing is available in version 2024.03 + # and newer so it is only needed to 2024.02 + patch( + "https://github.com/NOAA-GFDL/fms/pull/1559.patch?full_index=1", + sha256="2b12a6c35f357c3dddcfa5282576e56ab0e8e6c1ad1dab92a2c85ce3dfb815d4", + when="@2024.02", + ) + variant( "precision", values=("32", "64"), @@ -115,6 +131,7 @@ class Fms(CMakePackage): self.define_from_variant("GFS_PHYS"), self.define_from_variant("OPENMP"), self.define_from_variant("ENABLE_QUAD_PRECISION", "quad_precision"), + self.define_from_variant("SHARED_LIBS", "shared"), self.define_from_variant("WITH_YAML", "yaml"), self.define_from_variant("CONSTANTS"), self.define_from_variant("LARGEFILE", "large_file"), -- cgit v1.2.3-70-g09d2