diff options
| author | Daniele Cesarini <d.cesarini@cineca.it> | 2020-03-28 21:49:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-28 15:49:21 -0500 |
| commit | ddccad14c90e8485ee2e87368fc51765a765cf50 (patch) | |
| tree | b152654d6fd39adfa706a34e946a058bda1881e2 /var | |
| parent | a3e1b2bd58d02d43c2dce65b8e0cfc89791486f1 (diff) | |
| download | spack-ddccad14c90e8485ee2e87368fc51765a765cf50.tar.gz spack-ddccad14c90e8485ee2e87368fc51765a765cf50.tar.bz2 spack-ddccad14c90e8485ee2e87368fc51765a765cf50.tar.xz spack-ddccad14c90e8485ee2e87368fc51765a765cf50.zip | |
XIOS: add new versions (#15728)
* XIOS: add new versions
Patch has been removed because it was not applied to any previously
existing versions and it actually breaks the new versions added by this
PR.
* Sort versions from newest to oldest
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/xios/bld_extern_1.x.patch | 27 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/xios/package.py | 7 |
2 files changed, 5 insertions, 29 deletions
diff --git a/var/spack/repos/builtin/packages/xios/bld_extern_1.x.patch b/var/spack/repos/builtin/packages/xios/bld_extern_1.x.patch deleted file mode 100644 index fe52da1192..0000000000 --- a/var/spack/repos/builtin/packages/xios/bld_extern_1.x.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/bld.cfg 2017-12-23 15:21:01.458603785 +1100 -+++ b/bld.cfg 2017-12-23 15:36:36.667684136 +1100 -@@ -24,9 +24,6 @@ - - search_src true - src::zzz . --src::date $PWD/extern/boost/src/date_time --src::blitz $PWD/extern/blitz/src --src::netcdf $PWD/extern/netcdf4 - src::remap $PWD/extern/remap/src - bld::lib xios - bld::target libxios.a -@@ -46,11 +43,11 @@ - bld::tool::fc %FCOMPILER - bld::tool::fpp %FPP - bld::tool::cpp %CPP --bld::tool::cppflags %CBASE_INC -I${PWD}/extern/src_netcdf -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include -I${PWD}/extern/blitz/include --bld::tool::fppflags %BASE_INC -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include -+bld::tool::cppflags %CBASE_INC -I${PWD}/extern/rapidxml/include -+bld::tool::fppflags %BASE_INC -I${PWD}/extern/rapidxml/include - bld::tool::ld %LINKER - bld::tool::ldflags %LD_FLAGS --bld::tool::cflags %CFLAGS %CBASE_INC -I${PWD}/extern/src_netcdf -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include -I${PWD}/extern/blitz/include -+bld::tool::cflags %CFLAGS %CBASE_INC -I${PWD}/extern/rapidxml/include - bld::tool::fflags %FFLAGS %FBASE_INC - bld::tool::cppkeys %CPP_KEY - bld::tool::fppkeys %CPP_KEY diff --git a/var/spack/repos/builtin/packages/xios/package.py b/var/spack/repos/builtin/packages/xios/package.py index 55769026cf..54eca9fead 100644 --- a/var/spack/repos/builtin/packages/xios/package.py +++ b/var/spack/repos/builtin/packages/xios/package.py @@ -13,9 +13,13 @@ class Xios(Package): homepage = "https://forge.ipsl.jussieu.fr/ioserver/wiki" + version('develop', svn='http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/trunk') + version('2.5', revision=1860, + svn='http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/branchs/xios-2.5') + version('2.0', revision=1627, + svn='http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/branchs/xios-2.0') version('1.0', revision=910, svn='http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/branchs/xios-1.0') - version('develop', svn='http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/trunk') variant('mode', values=('debug', 'dev', 'prod'), default='dev', description='Build for debugging, development or production') @@ -24,7 +28,6 @@ class Xios(Package): # Use spack versions of blitz and netcdf-c for compatibility # with recent compilers and optimised platform libraries: patch('bld_extern_1.0.patch', when='@:1.0') - patch('bld_extern_1.x.patch', when='@1.1:') # Workaround bug #17782 in llvm, where reading a double # followed by a character is broken (e.g. duration '1d'): |