hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

esmf: add v7.1.0r, with a gcc patch for macOS (#12509)

Browse source
This commit is contained in:
Greg 2019-08-22 17:55:56 -06:00 committed by Todd Gamblin
parent 0e907326f5
commit d5c3cc0a85
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
var/spack/repos/builtin/packages/esmf/gcc_darwin.patch Normal file
View file

@ -0,0 +1,10 @@
--- a/build_config/Darwin.gfortran.default/ESMC_Conf.h 2019-08-21 10:06:06.000000000 -0600
+++ b/build_config/Darwin.gfortran.default/ESMC_Conf.h 2019-08-21 10:03:41.000000000 -0600
@@ -31,6 +31,7 @@
// Typedef to match the data type of the 'hidden' string length
// argument that Fortran uses when passing CHARACTER strings.
#if (__GNUC__ > 7)
+#include <cstddef>
typedef size_t ESMCI_FortranStrLenArg;
#else
typedef int ESMCI_FortranStrLenArg;

13
var/spack/repos/builtin/packages/esmf/package.py
View file

@ -15,8 +15,9 @@ class Esmf(MakefilePackage):
and utilities for developing individual models.""" and utilities for developing individual models."""
homepage = "https://www.earthsystemcog.org/projects/esmf/" homepage = "https://www.earthsystemcog.org/projects/esmf/"
url = "http://www.earthsystemmodeling.org/esmf_releases/non_public/ESMF_7_0_1/esmf_7_0_1_src.tar.gz" url = "http://www.earthsystemmodeling.org/esmf_releases/public/ESMF_7_1_0r/esmf_7_1_0r_src.tar.gz"
version('7.1.0r', '9e455bc36a0aaa9b87e0bdedc78a47f5')
version('7.0.1', 'd3316ea79b032b8fb0cd40e5868a0261') version('7.0.1', 'd3316ea79b032b8fb0cd40e5868a0261')
variant('mpi', default=True, description='Build with MPI support') variant('mpi', default=True, description='Build with MPI support')
@ -52,17 +53,21 @@ class Esmf(MakefilePackage):
# Allow different directories for creation and # Allow different directories for creation and
# installation of dynamic libraries on OSX: # installation of dynamic libraries on OSX:
patch('darwin_dylib_install_name.patch', when='platform=darwin') patch('darwin_dylib_install_name.patch', when='platform=darwin @:7.0.99')
# Missing include file for gcc compilers on mac
# https://trac.macports.org/ticket/57493
patch('gcc_darwin.patch', when='platform=darwin @7.1.0r %gcc')
# Make script from mvapich2.patch executable # Make script from mvapich2.patch executable
@run_before('build')
@when('@:7.0.99') @when('@:7.0.99')
@run_before('build')
def chmod_scripts(self): def chmod_scripts(self):
chmod = which('chmod') chmod = which('chmod')
chmod('+x', 'scripts/libs.mvapich2f90') chmod('+x', 'scripts/libs.mvapich2f90')
def url_for_version(self, version): def url_for_version(self, version):
return "http://www.earthsystemmodeling.org/esmf_releases/non_public/ESMF_{0}/esmf_{0}_src.tar.gz".format(version.underscored) return "http://www.earthsystemmodeling.org/esmf_releases/public/ESMF_{0}/esmf_{0}_src.tar.gz".format(version.underscored)
def edit(self, spec, prefix): def edit(self, spec, prefix):
# Installation instructions can be found at: # Installation instructions can be found at: