Super Pierre-Yves Barriat 6 years ago
parent
commit
814c43d290

+ 3 - 1
foss-2018b/Mesa-18.1.1-foss-2018b.eb → foss-2018b/Mesa-18.1.1-foss-2018b-Python-3.6.6.eb

@@ -11,6 +11,7 @@ easyblock = 'ConfigureMake'
 
 name = 'Mesa'
 version = '18.1.1'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://www.mesa3d.org/'
 description = """Mesa is an open-source implementation of the OpenGL specification -
@@ -39,12 +40,13 @@ builddependencies = [
     ('Bison', '3.0.5'),
     ('Autotools', '20180311'),
     ('pkg-config', '0.29.2'),
-    ('Mako', '1.0.7', '-Python-3.6.6'),
+    ('Mako', '1.0.7', versionsuffix),
     ('libxml2', '2.9.8'),
     ('expat', '2.2.5'),
 ]
 
 dependencies = [
+    ('Python', '3.6.6'),
     ('zlib', '1.2.11'),
     ('nettle', '3.4'),
     ('libdrm', '2.4.92'),

+ 5 - 4
foss-2018b/R-3.5.1-foss-2018b-Python-3.6.6.eb

@@ -1,6 +1,6 @@
 name = 'R'
 version = '3.5.1'
-versionsuffix = '-Python-3.6.6'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://www.r-project.org/'
 description = """R is a free software environment for statistical computing and graphics."""
@@ -15,9 +15,10 @@ builddependencies = [
     ('pkg-config', '0.29.2'),
 ]
 dependencies = [
+    ('Python', '3.6.6'),
     ('X11', '20180604'),
-    #('Mesa', '18.1.1'),
-    #('libGLU', '9.0.0'),
+    ('Mesa', '18.1.1', versionsuffix),
+    ('libGLU', '9.0.0', versionsuffix),
     ('cairo', '1.14.12'),
     ('libreadline', '7.0'),
     ('ncurses', '6.1'),
@@ -33,7 +34,7 @@ dependencies = [
     ('Tk', '8.6.8'),  # for tcltk
     ('cURL', '7.60.0'),  # for RCurl
     ('libxml2', '2.9.8'),  # for XML
-    ('GDAL', '2.2.3', '-Python-3.6.6'),  # for rgdal
+    ('GDAL', '2.2.3', versionsuffix),  # for rgdal
     ('PROJ', '5.0.0'),  # for rgdal
     ('GMP', '6.1.2'),  # for igraph
     ('NLopt', '2.4.2'),  # for nloptr

+ 27 - 0
foss-2018b/libGLU-9.0.0-foss-2018b-Python-3.6.6.eb

@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'libGLU'
+version = '9.0.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'ftp://ftp.freedesktop.org/pub/mesa/glu/'
+description = """The OpenGL Utility Library (GLU) is a computer graphics library for OpenGL. """
+
+toolchain = {'name': 'foss', 'version': '2018b'}
+toolchainopts = {'pic': True}
+
+source_urls = ['ftp://ftp.freedesktop.org/pub/mesa/glu/']
+sources = ['glu-%(version)s.tar.bz2']
+checksums = ['1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12']
+
+dependencies = [
+    ('Python', '3.6.6'),
+    ('Mesa', '18.1.1', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libGLU.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'vis'