Pierre-Yves Barriat 6 years ago
parent
commit
3dc406a4a9

+ 8 - 9
foss-2017b/CDO-1.9.2-foss-2017b.eb → foss-2017b/CDO-1.9.5-foss-2017b.eb

@@ -1,7 +1,7 @@
 easyblock = 'ConfigureMake'
 
 name = 'CDO'
-version = '1.9.2'
+version = '1.9.5'
 
 homepage = 'https://code.zmaw.de/projects/cdo'
 description = """CDO is a collection of command line Operators to manipulate and analyse Climate and NWP model Data."""
@@ -9,25 +9,24 @@ description = """CDO is a collection of command line Operators to manipulate and
 toolchain = {'name': 'foss', 'version': '2017b'}
 toolchainopts = {'opt': True, 'pic': True, 'usempi': True}
 
+source_urls = ['https://code.mpimet.mpg.de/attachments/download/18264/']
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['https://code.mpimet.mpg.de/attachments/download/16035/']
-checksums = ['d1c5092167034a48e4b8ada24cf78a1d4b84e364ffbb08b9ca70d13f428f300c']
+checksums = ['48ed65cc5b436753c8e7f9eadd8aa97376698ce230ceafed2a4350a5b1a27148']
 
-hdf5_ver = '1.8.19'
 dependencies = [
-    ('HDF5', hdf5_ver),
-    ('netCDF', '4.4.1.1', '-HDF5-%s' % hdf5_ver),
+    ('HDF5', '1.10.1'),
+    ('netCDF', '4.6.1'),
     ('YAXT', '0.5.1'),
-    ('grib_api', '1.24.0'),
+    ('ecCodes', '2.8.2'),
 ]
 
-configopts = "--with-hdf5=$EBROOTHDF5 --with-netcdf=$EBROOTNETCDF --with-grib_api=$EBROOTGRIB_API"
+configopts = "--with-hdf5=$EBROOTHDF5 --with-netcdf=$EBROOTNETCDF --with-eccodes=$EBROOTECCODES"
 
 # fix for linking issues with HDF5 libraries for libcdi, should link with both -lnetcdf and -lhdf5_hl -lhdf5
 prebuildopts = "find libcdi -name Makefile | xargs sed -i 's/-lnetcdf -lnetcdf/-lnetcdf -lhdf5_hl -lhdf5/g' && "
 
 sanity_check_paths = {
-    'files': ["bin/cdo"],
+    'files': ['bin/cdo'],
     'dirs': [],
 }
 

+ 31 - 0
foss-2017b/LibUUID-1.0.3-foss-2017b.eb

@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'LibUUID'
+version = '1.0.3'
+
+homepage = 'http://sourceforge.net/projects/libuuid/'
+description = """Portable uuid C library"""
+
+toolchain = {'name': 'foss', 'version': '2017b'}
+
+source_urls = [
+    SOURCEFORGE_SOURCE,
+    'https://raw.githubusercontent.com/karelzak/util-linux/stable/v2.32/libuuid/src',
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    {'filename': 'libuuid.sym', 'extract_cmd': 'cp %s %(builddir)s'},
+]
+checksums = [
+    '46af3275291091009ad7f1b899de3d0cea0252737550e7919d17237997db5644',  # libuuid-1.0.3.tar.gz
+    '5932866797560bf5822c3340b64dff514afb6cef23a824f96991f8e9e9d29028',  # libuuid.sym
+]
+
+preconfigopts = 'LDFLAGS="$LDFLAGS -Wl,--version-script=%(builddir)s/libuuid.sym"'
+
+sanity_check_paths = {
+    'files': ['include/uuid/uuid.h', 'lib/libuuid.a', 'lib/libuuid.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'lib'

+ 1 - 2
foss-2017b/NCO-4.7.1-foss-2017b.eb

@@ -23,8 +23,7 @@ dependencies = [
     ('ANTLR', '2.7.7'),
     ('libdap', '3.19.1'),
     ('GSL', '2.4'),
-    # sticking to netCDF 4.4.1.1 with HDF5 1.8.19 for compatibility with ESMF
-    ('netCDF', '4.4.1.1', '-HDF5-1.8.19'),
+    ('netCDF', '4.6.1'),
 ]
 
 sanity_check_paths = {

+ 34 - 0
foss-2017b/ecCodes-2.8.2-foss-2017b.eb

@@ -0,0 +1,34 @@
+easyblock = 'CMakeMake'
+
+name = 'ecCodes'
+version = '2.8.2'
+
+homepage = 'https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home'
+description = """ecCodes is a package developed by ECMWF which provides an application programming interface and
+ a set of tools for decoding and encoding messages in the following formats: WMO FM-92 GRIB edition 1 and edition 2,
+ WMO FM-94 BUFR edition 3 and edition 4, WMO GTS abbreviated header (only decoding)."""
+
+toolchain = {'name': 'foss', 'version': '2017b'}
+
+source_urls = ['https://confluence.ecmwf.int/download/attachments/45757960/']
+sources = ['eccodes-%(version)s-Source.tar.gz']
+checksums = ['36e6e73d654027b31c323b0eddd15e4d1f011ad81e79e9c71146ba96293d712a']
+
+builddependencies = [('CMake', '3.11.4')]
+dependencies = [
+    ('netCDF', '4.6.1'),
+    ('JasPer', '2.0.14'),
+]
+
+separate_build_dir = True
+
+configopts = "-DENABLE_NETCDF=ON -DENABLE_JPG=ON -DENABLE_PYTHON=OFF"
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['bufr_copy', 'bufr_dump', 'bufr_filter', 'bufr_ls',
+                                     'codes_count', 'codes_info', 'codes_split_file',
+                                     'grib_copy', 'grib_dump', 'grib_filter', 'grib_ls']],
+    'dirs': [],
+}
+
+moduleclass = 'tools'

+ 2 - 2
foss-2017b/libdap-3.19.1-foss-2017b.eb

@@ -19,8 +19,8 @@ builddependencies = [
 ]
 
 dependencies = [
-    ('cURL', '7.56.0'),
-    ('libxml2', '2.9.4'),
+    ('cURL', '7.60.0'),
+    ('libxml2', '2.9.7'),
     ('LibUUID', '1.0.3'),
 ]
 

+ 3 - 3
foss-2017b/ncview-2.1.7-foss-2017b.eb

@@ -31,10 +31,10 @@ configopts = "--with-udunits2_incdir=$EBROOTUDUNITS/include --with-udunits2_libd
 configopts += "--with-nc-config=$EBROOTNETCDF/bin/nc-config"
 
 dependencies = [
-    ('netCDF', '4.4.1.1', '-HDF5-1.8.19'),
-    ('netCDF-Fortran', '4.4.4'),
+    ('netCDF', '4.6.1'),
+    ('netCDF-Fortran', '4.4.5'),
     ('UDUNITS', '2.2.26'),
-    ('X11', '20171023'),
+    ('X11', '20180131'),
     ('zlib', '1.2.11'),
 ]