From fb2a837a384d5cc3837272b84a480373ba506ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Krup=C4=8D=C3=ADk?= <lukas.krupcik@vsb.cz>
Date: Tue, 2 Oct 2018 13:17:14 +0200
Subject: [PATCH] 	modified:   l/LLVM/LLVM-7.0.0-intel-2017c.eb 	new
 file:   m/Mesa/Mesa-18.1.9-intel-2017c.eb

---
 l/LLVM/LLVM-7.0.0-intel-2017c.eb  |  4 --
 m/Mesa/Mesa-18.1.9-intel-2017c.eb | 62 +++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 4 deletions(-)
 create mode 100644 m/Mesa/Mesa-18.1.9-intel-2017c.eb

diff --git a/l/LLVM/LLVM-7.0.0-intel-2017c.eb b/l/LLVM/LLVM-7.0.0-intel-2017c.eb
index b64790df..1344727a 100644
--- a/l/LLVM/LLVM-7.0.0-intel-2017c.eb
+++ b/l/LLVM/LLVM-7.0.0-intel-2017c.eb
@@ -32,12 +32,8 @@ dependencies = [
 
 configopts = '-DBUILD_SHARED_LIBS=ON -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -shared-intel" '
 # required to install extra tools in bin/
-<<<<<<< HEAD
 configopts += "-DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_ENABLE_ZLIB=ON -DLLVM_ENABLE_RTTI=1 "
 configopts += "-DCMAKE_BUILD_TYPE=Release "
-=======
-configopts += "-DLLVM_INSTALL_UTILS=ON -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_ENABLE_ZLIB=ON"
->>>>>>> e97186d5e8c19eac774b0d280ee66d007903d67a
 
 sanity_check_paths = {
     'files': ['bin/llvm-ar', 'bin/FileCheck'],
diff --git a/m/Mesa/Mesa-18.1.9-intel-2017c.eb b/m/Mesa/Mesa-18.1.9-intel-2017c.eb
new file mode 100644
index 00000000..6b4533ab
--- /dev/null
+++ b/m/Mesa/Mesa-18.1.9-intel-2017c.eb
@@ -0,0 +1,62 @@
+# IT4Innovations 2018
+
+easyblock = 'ConfigureMake'
+
+name = 'Mesa'
+version = '18.1.9'
+
+homepage = 'http://www.mesa3d.org/'
+description = """Mesa is an open-source implementation of the OpenGL specification -
+ a system for rendering interactive 3D graphics."""
+
+toolchain = {'name': 'intel', 'version': '2017c'}
+# swr detects and builds parts specific for AVX and AVX2. If we use
+# -xHost, this always gets overwritten and will fail.
+toolchainopts = {'optarch': False}
+
+sources = [SOURCELOWER_TAR_XZ]
+source_urls = [
+    'https://mesa.freedesktop.org/archive/',
+    'https://mesa.freedesktop.org/archive/%(version)s',
+    'ftp://ftp.freedesktop.org/pub/mesa/%(version)s',
+    'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x/%(version)s',
+]
+#patches = ['Mesa-17.0.2_fix-strip-llvm-flags.patch']
+
+builddependencies = [
+    ('flex', '2.6.3', '', True),
+    ('Bison', '3.0.4', '', True),
+    ('Autotools', '20150215', '', True),
+    ('pkg-config', '0.29.2', '', True),
+    ('Mako', '1.0.6', '-Python-2.7.13', True),
+    ('libxml2', '2.9.4', '-Python-2.7.13', True),
+]
+
+dependencies = [
+    ('zlib', '1.2.11', '', True),
+    ('nettle', '3.3'),
+    ('libdrm', '2.4.76', '', True),
+    ('LLVM', '7.0.0'),
+    ('X11', '20170314', '', True),
+    ('expat', '2.2.0', '', True),
+]
+
+# GLU is not part anymore of Mesa package!
+configopts = " --disable-osmesa --enable-gallium-osmesa --enable-gallium-llvm --enable-glx --disable-dri"
+configopts += " --disable-gbm --disable-driglx-direct --with-gallium-drivers='swrast,swr' --disable-egl"
+configopts += " --with-osmesa-bits=32 --enable-texture-float --enable-llvm-shared-libs "
+
+buildopts = 'V=1'
+
+sanity_check_paths = {
+    'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libOSMesa.%s' % SHLIB_EXT,
+              'lib/libGLESv1_CM.%s' % SHLIB_EXT, 'lib/libGLESv2.%s' % SHLIB_EXT,
+              'include/GL/glext.h', 'include/GL/gl_mangle.h',
+              'include/GL/glx.h', 'include/GL/osmesa.h',
+              'include/GL/gl.h', 'include/GL/glxext.h',
+              'include/GL/glx_mangle.h', 'include/GLES/gl.h',
+              'include/GLES2/gl2.h', 'include/GLES3/gl3.h'],
+    'dirs': []
+}
+
+moduleclass = 'vis'