diff options
| author | Jim Edwards <jedwards@ucar.edu> | 2023-03-24 13:47:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-24 10:47:44 -0700 |
| commit | 15f7b72557a9c56d66327daf49284fc22cb4bc8d (patch) | |
| tree | 8e9835fa584d71b1a352d45a23a7bc8f71c8e153 | |
| parent | 6bf33b2b7fb2b3f6992a6b1258992b6e8d7af12c (diff) | |
| download | spack-15f7b72557a9c56d66327daf49284fc22cb4bc8d.tar.gz spack-15f7b72557a9c56d66327daf49284fc22cb4bc8d.tar.bz2 spack-15f7b72557a9c56d66327daf49284fc22cb4bc8d.tar.xz spack-15f7b72557a9c56d66327daf49284fc22cb4bc8d.zip | |
gfortran version fix (#36351)
* gfortran version fix
* modified approach to get gfortran version
* add checksum for v8.4.1
| -rw-r--r-- | var/spack/repos/builtin/packages/esmf/package.py | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py index 4aefe352b5..553ec62b84 100644 --- a/var/spack/repos/builtin/packages/esmf/package.py +++ b/var/spack/repos/builtin/packages/esmf/package.py @@ -26,6 +26,7 @@ class Esmf(MakefilePackage): # Develop is a special name for spack and is always considered the newest version version("develop", branch="develop") # generate chksum with spack checksum esmf@x.y.z + version("8.4.1", sha256="1b54cee91aacaa9df400bd284614cbb0257e175f6f3ec9977a2d991ed8aa1af6") version("8.4.0", sha256="28531810bf1ae78646cda6494a53d455d194400f19dccd13d6361871de42ed0f") version("8.3.1", sha256="6c39261e55dcdf9781cdfa344417b9606f7f961889d5ec626150f992f04f146d") version("8.3.0", sha256="0ff43ede83d1ac6beabd3d5e2a646f7574174b28a48d1b9f2c318a054ba268fd") @@ -172,22 +173,25 @@ class Esmf(MakefilePackage): # ESMF_COMPILER must be set to select which Fortran and # C++ compilers are being used to build the ESMF library. + if self.compiler.name == "gcc": env.set("ESMF_COMPILER", "gfortran") - gfortran_major_version = int( - spack.compiler.get_compiler_version_output(self.compiler.fc, "-dumpversion").split( - "." - )[0] - ) + with self.compiler.compiler_environment(): + gfortran_major_version = int( + spack.compiler.get_compiler_version_output( + self.compiler.fc, "-dumpversion" + ).split(".")[0] + ) elif self.compiler.name == "intel" or self.compiler.name == "oneapi": env.set("ESMF_COMPILER", "intel") elif self.compiler.name in ["clang", "apple-clang"]: env.set("ESMF_COMPILER", "gfortranclang") - gfortran_major_version = int( - spack.compiler.get_compiler_version_output(self.compiler.fc, "-dumpversion").split( - "." - )[0] - ) + with self.compiler.compiler_environment(): + gfortran_major_version = int( + spack.compiler.get_compiler_version_output( + self.compiler.fc, "-dumpversion" + ).split(".")[0] + ) elif self.compiler.name == "nag": env.set("ESMF_COMPILER", "nag") elif self.compiler.name == "pgi": |