Browse Source

Refresh foss 2017b for NCL

Pierre-Yves Barriat 6 years ago
parent
commit
8f73627fe8

+ 1 - 1
foss-2017b/GDAL-2.2.4-foss-2017b-Python-3.6.3.eb

@@ -25,7 +25,7 @@ dependencies = [
     ('libxml2', '2.9.4'),
     ('libpng', '1.6.34'),
     ('libjpeg-turbo', '1.5.2'),
-    ('JasPer', '1.900.1'),
+    ('JasPer', '2.0.14'),
     ('LibTIFF', '4.0.9'),
     ('zlib', '1.2.11'),
     ('cURL', '7.60.0'),

+ 1 - 1
foss-2017b/NCL-6.5.0-foss-2017b.eb

@@ -19,7 +19,7 @@ dependencies = [
     ('cURL', '7.60.0'),
     ('JasPer', '2.0.14'),
     ('g2lib', '1.4.0'),
-    ('g2clib', '1.6.0-patch'),
+    ('g2clib', '1.6.0'),
     ('HDF', '4.2.14'),
     ('HDF5', '1.10.1'),
     ('netCDF', '4.6.1',),

+ 7 - 3
foss-2017b/g2clib-1.6.0-foss-2017b.eb

@@ -8,11 +8,15 @@ toolchain = {'name': 'foss', 'version': '2017b'}
 
 source_urls = [homepage]
 sources = ['%(name)s-%(version)s.tar']
-checksums = ['afec1ea29979b84369d0f46f305ed12f73f1450ec2db737664ec7f75c1163add']
+patches = ['g2clib-1.6.0-with-JasPer-2.x.patch']
+checksums = [
+    'afec1ea29979b84369d0f46f305ed12f73f1450ec2db737664ec7f75c1163add',  # g2clib-1.6.0.tar
+    '2e62502d7823be5407ea023029dd206930a1034421d141dd346b468e177a7fce',  # g2clib-1.6.0-with-JasPer-2.x.patch
+]
 
 dependencies = [
-    ('JasPer', '1.900.1'),
-    ('libpng', '1.6.32'),
+    ('JasPer', '2.0.14'),
+    ('libpng', '1.6.34'),
 ]
 
 # parallel build tends to fail

+ 7 - 3
foss-2017b/g2lib-1.4.0-foss-2017b.eb

@@ -8,15 +8,19 @@ toolchain = {'name': 'foss', 'version': '2017b'}
 
 source_urls = [homepage]
 sources = ['%(name)s-%(version)s.tar']
-patches = ['fix_makefile.patch']
+patches = [
+    'fix_makefile.patch',
+    'g2lib-1.4.0-with-JasPer-2.x.patch',
+]
 checksums = [
     '50ed657f7395377aa8de1097e62d5be68f48e90dc859766cffddb39a909cc7b3',  # g2lib-1.4.0.tar
     'bee2e6b53a5cd6a81c13735900c4ac9e3ce05bd06cda68b56b1bd51b4da7efd8',  # fix_makefile.patch
+    'cd4c668dab76ef3b61fa902c2eed24747517d4cbc3ec0aaffab37e6b80946170',  # g2lib-1.4.0-with-JasPer-2.x.patch
 ]
 
 dependencies = [
-    ('JasPer', '1.900.1'),
-    ('libpng', '1.6.32'),
+    ('JasPer', '2.0.14'),
+    ('libpng', '1.6.34'),
 ]
 
 buildopts = 'CFLAGS="$CFLAGS -DLINUXG95 -D__64BIT__" FFLAGS="$FFLAGS -cpp -I."'

+ 44 - 0
foss-2017b/git-2.16.1-foss-2017b.eb

@@ -0,0 +1,44 @@
+easyblock = 'ConfigureMake'
+
+name = 'git'
+version = '2.16.1'
+
+homepage = 'http://git-scm.com/'
+description = """Git is a free and open source distributed version control system designed
+to handle everything from small to very large projects with speed and efficiency."""
+
+toolchain = {'name': 'foss', 'version': '2017b'}
+
+sources = ['v%(version)s.tar.gz']
+source_urls = ['https://github.com/git/git/archive']
+checksums = ['e3f13e3c86981f64b1920749c07be11841bbf5a3434ec9b5611959dfd7c7398e']
+
+builddependencies = [
+    ('Autotools', '20170619'),
+]
+dependencies = [
+    ('cURL', '7.60.0'),
+    ('expat', '2.2.5'),
+    ('gettext', '0.19.8.1', '-libxml2-2.9.7'),
+    ('Perl', '5.26.1'),
+]
+
+# asciidoc and xmlto are required for git man/doc build
+osdependencies = ['asciidoc', 'xmlto']
+
+preconfigopts = 'make configure && '
+
+# Work around git build system bug.  If LIBS contains -lpthread, then configure
+# will not append -lpthread to LDFLAGS, but Makefile ignores LIBS.
+configopts = "--with-perl=${EBROOTPERL}/bin/perl --enable-pthreads='-lpthread'"
+
+# required to also install documentation
+buildopts = "doc"
+installopts = "install-doc"
+
+sanity_check_paths = {
+    'files': ['bin/git'],
+    'dirs': ['share/man'],
+}
+
+moduleclass = 'tools'