From 67b802a2d5fa8720f5068e20e8f7f0eb3b6ec6ce Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Tue, 23 Aug 2016 17:28:06 +0200
Subject: [PATCH 01/13] Added Mesa/12.0.1 for intel/2016b

---
 .../l/libdrm/libdrm-2.4.70-intel-2016b.eb     | 24 ++++++++
 .../m/Mesa/Mesa-12.0.1-intel-2016b.eb         | 58 +++++++++++++++++++
 .../m/Mesa/libGLU-9.0.0-intel-2016b.eb        | 24 ++++++++
 3 files changed, 106 insertions(+)
 create mode 100644 easybuild/easyconfigs/l/libdrm/libdrm-2.4.70-intel-2016b.eb
 create mode 100644 easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb
 create mode 100644 easybuild/easyconfigs/m/Mesa/libGLU-9.0.0-intel-2016b.eb

diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.70-intel-2016b.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.70-intel-2016b.eb
new file mode 100644
index 00000000000..9fb07a29545
--- /dev/null
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.70-intel-2016b.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'libdrm'
+version = '2.4.70'
+
+homepage = 'http://dri.freedesktop.org'
+description = """Direct Rendering Manager runtime library."""
+
+source_urls = ['http://dri.freedesktop.org/libdrm/']
+sources = [SOURCELOWER_TAR_GZ]
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+dependencies = [
+    ('X11', '20160819'),
+]
+
+sanity_check_paths = {
+    'files': ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+              'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
+    'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb b/easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb
new file mode 100644
index 00000000000..c6932e72528
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb
@@ -0,0 +1,58 @@
+easyblock = 'ConfigureMake'
+
+name = 'Mesa'
+version = '12.0.1'
+
+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': '2016b'}
+
+sources = [SOURCELOWER_TAR_XZ]
+source_urls = [
+    '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',
+]
+
+builddependencies = [
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+    ('Autotools', '20150215'),
+    ('pkg-config', '0.29.1'),
+]
+
+dependencies = [
+    ('libxml2', '2.9.4'),
+    ('X11', '20160819'),
+    ('libdrm', '2.4.70'),
+    ('LLVM', '3.8.1'),
+#   ('eudev', '3.1.5'),
+]
+
+# Use the os provided libudev or the EB provided eudev
+osdependencies = ['libudev']
+
+# GLU is not part anymore of Mesa package!
+configopts = " --disable-osmesa --enable-gallium-osmesa --enable-gallium-llvm --enable-glx --disable-dri"
+configopts += " --disable-driglx-direct --with-gallium-drivers='swrast,swr' --disable-egl"
+configopts += " --with-osmesa-bits=32 --enable-texture-float --enable-llvm-shared-libs "
+
+# package-config files for os dependencies are in an os specific place
+#preconfigopts = 'libtoolize && PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
+#preconfigopts = ' libtoolize &&  '
+
+#prebuildopts = 'env CPATH="$EBROOTLIBDRM/include/libdrm:$CPATH" CFLAGS= '
+
+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/wglext.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': []
+}
+
+maxparallel = 1
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/Mesa/libGLU-9.0.0-intel-2016b.eb b/easybuild/easyconfigs/m/Mesa/libGLU-9.0.0-intel-2016b.eb
new file mode 100644
index 00000000000..1bfa6744b97
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mesa/libGLU-9.0.0-intel-2016b.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'libGLU'
+version = '9.0.0'
+
+homepage = 'ftp://ftp.freedesktop.org/pub/mesa/glu/'
+description = """The OpenGL Utility Library (GLU) is a computer graphics library for OpenGL. """
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+source_urls = ['ftp://ftp.freedesktop.org/pub/mesa/glu/']
+sources = ['glu-%(version)s.tar.bz2']
+
+dependencies = [
+    ('Mesa', '12.0.1'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libGLU.so.1'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'

From 5587af5083c1ee438943958a4fb3bcfbcf93bb3b Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Tue, 23 Aug 2016 17:49:03 +0200
Subject: [PATCH 02/13] Fix easyconfig location

---
 .../easyconfigs/{m/Mesa => l/libGLU}/libGLU-9.0.0-intel-2016b.eb  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename easybuild/easyconfigs/{m/Mesa => l/libGLU}/libGLU-9.0.0-intel-2016b.eb (100%)

diff --git a/easybuild/easyconfigs/m/Mesa/libGLU-9.0.0-intel-2016b.eb b/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2016b.eb
similarity index 100%
rename from easybuild/easyconfigs/m/Mesa/libGLU-9.0.0-intel-2016b.eb
rename to easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2016b.eb

From 51c8bbcbda67b2f39554e290644865f9f3b933a3 Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Wed, 24 Aug 2016 17:52:47 +0200
Subject: [PATCH 03/13] Added deps for Mesa

---
 .../Mako-1.0.4-intel-2016b-Python-2.7.12.eb   | 22 +++++++++++++++
 .../n/nettle/nettle-3.2-intel-2016b.eb        | 28 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 easybuild/easyconfigs/m/Mako/Mako-1.0.4-intel-2016b-Python-2.7.12.eb
 create mode 100644 easybuild/easyconfigs/n/nettle/nettle-3.2-intel-2016b.eb

diff --git a/easybuild/easyconfigs/m/Mako/Mako-1.0.4-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/m/Mako/Mako-1.0.4-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 00000000000..4817748dbce
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mako/Mako-1.0.4-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,22 @@
+easyblock = 'PythonPackage'
+
+name = 'Mako'
+version = '1.0.4'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.makotemplates.org'
+description = """A super-fast templating language that borrows the best ideas from the existing templating languages"""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '2.7.12')]
+
+sanity_check_paths = {
+    'files': ['bin/mako-render'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/%(name)s-%(version)s-py%(pyshortver)s.egg'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/nettle/nettle-3.2-intel-2016b.eb b/easybuild/easyconfigs/n/nettle/nettle-3.2-intel-2016b.eb
new file mode 100644
index 00000000000..728d2523674
--- /dev/null
+++ b/easybuild/easyconfigs/n/nettle/nettle-3.2-intel-2016b.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'nettle'
+version = '3.2'
+
+homepage = 'http://www.lysator.liu.se/~nisse/nettle/'
+description = """Nettle is a cryptographic library that is designed to fit easily
+ in more or less any context: In crypto toolkits for object-oriented
+ languages (C++, Python, Pike, ...), in applications like LSH or GNUPG,
+ or even in kernel space."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('GMP', '6.1.1'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['nettle-hash', 'nettle-lfib-stream', 'pkcs1-conv', 'sexp-conv']] +
+             ['lib64/libhogweed.a', 'lib64/libhogweed.%s' % SHLIB_EXT,
+              'lib64/libnettle.a', 'lib64/libnettle.%s' % SHLIB_EXT],
+    'dirs': ['include/nettle'],
+}
+
+moduleclass = 'lib'

From f4f58a11d064edd60f218ae6a7b80d6516d5acf9 Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Wed, 24 Aug 2016 17:53:14 +0200
Subject: [PATCH 04/13] Updated Mesa deps

---
 .../m/Mesa/Mesa-12.0.1-intel-2016b.eb         | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb b/easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb
index c6932e72528..c421b33e7ce 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb
@@ -1,3 +1,10 @@
+# the purpose of the easyconfig is to build a Mesa for software rendering,
+# not hardware rendering. This means you want at least SSE4.2. We build:
+# - llvmpipe: the high-performance Gallium LLVM driver
+# - swr: Intel's OpenSWR
+# it will try to use the llvmpipe by default. It you want swr, do:
+# GALLIUM_DRIVER=swr
+
 easyblock = 'ConfigureMake'
 
 name = 'Mesa'
@@ -24,27 +31,18 @@ builddependencies = [
 ]
 
 dependencies = [
-    ('libxml2', '2.9.4'),
+    ('Mako', '1.0.4'),
+    ('nettle', '3.2'),
     ('X11', '20160819'),
     ('libdrm', '2.4.70'),
     ('LLVM', '3.8.1'),
-#   ('eudev', '3.1.5'),
 ]
 
-# Use the os provided libudev or the EB provided eudev
-osdependencies = ['libudev']
-
 # GLU is not part anymore of Mesa package!
 configopts = " --disable-osmesa --enable-gallium-osmesa --enable-gallium-llvm --enable-glx --disable-dri"
 configopts += " --disable-driglx-direct --with-gallium-drivers='swrast,swr' --disable-egl"
 configopts += " --with-osmesa-bits=32 --enable-texture-float --enable-llvm-shared-libs "
 
-# package-config files for os dependencies are in an os specific place
-#preconfigopts = 'libtoolize && PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
-#preconfigopts = ' libtoolize &&  '
-
-#prebuildopts = 'env CPATH="$EBROOTLIBDRM/include/libdrm:$CPATH" CFLAGS= '
-
 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',
@@ -53,6 +51,4 @@ sanity_check_paths = {
     'dirs': []
 }
 
-maxparallel = 1
-
 moduleclass = 'vis'

From 3d3b4d06c5d1f264a1a7d4793524044fc51a133c Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Wed, 24 Aug 2016 17:58:36 +0200
Subject: [PATCH 05/13] Correct versionsuffix

---
 easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb b/easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb
index c421b33e7ce..014dfb49448 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb
@@ -31,7 +31,7 @@ builddependencies = [
 ]
 
 dependencies = [
-    ('Mako', '1.0.4'),
+    ('Mako', '1.0.4', '-Python-2.7.12'),
     ('nettle', '3.2'),
     ('X11', '20160819'),
     ('libdrm', '2.4.70'),

From bb8cd3ad96829090b30765f12e173548ddd970c9 Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Wed, 24 Aug 2016 18:06:26 +0200
Subject: [PATCH 06/13] Downgrade to build deps

---
 easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb   | 4 +++-
 easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-no-X11.eb | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb b/easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb
index 014dfb49448..1b4d5ebc13d 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb
@@ -28,10 +28,12 @@ builddependencies = [
     ('Bison', '3.0.4'),
     ('Autotools', '20150215'),
     ('pkg-config', '0.29.1'),
+    ('Mako', '1.0.4', '-Python-2.7.12'),
+    ('zlib', '1.2.8'),
+    ('libxml2', '2.9.4'),
 ]
 
 dependencies = [
-    ('Mako', '1.0.4', '-Python-2.7.12'),
     ('nettle', '3.2'),
     ('X11', '20160819'),
     ('libdrm', '2.4.70'),
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-no-X11.eb
index 9eede492106..ee021a1cfc5 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-no-X11.eb
@@ -20,6 +20,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+# To be clear: this will still require the X11 to be present.
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'

From bdcad38bf4e48f671c4457cc0c6d16172d8fd4c6 Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Thu, 25 Aug 2016 10:03:05 +0200
Subject: [PATCH 07/13] Add python enabled libxml2 for Mesa

---
 ...libxml2-2.9.4-intel-2016b-Python-2.7.12.eb | 33 +++++++++++++++++++
 .../m/Mesa/Mesa-12.0.1-intel-2016b.eb         |  6 ++--
 2 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb

diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb
new file mode 100644
index 00000000000..8f6fcf89928
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'libxml2'
+version = '2.9.4'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://xmlsoft.org/'
+description = """Libxml2 is the XML C parser and
+toolchain developed for the Gnome project
+ (but usable outside of the Gnome platform)."""
+
+toolchain = {'name': 'intel', 'version': '2016b'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Python', '2.7.12'),
+]
+
+sanity_check_paths = {
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
+    'dirs': ['bin', 'include/libxml2/libxml'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb b/easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb
index 1b4d5ebc13d..821ca3a0b7a 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-12.0.1-intel-2016b.eb
@@ -29,15 +29,15 @@ builddependencies = [
     ('Autotools', '20150215'),
     ('pkg-config', '0.29.1'),
     ('Mako', '1.0.4', '-Python-2.7.12'),
-    ('zlib', '1.2.8'),
-    ('libxml2', '2.9.4'),
+    ('libxml2', '2.9.4', '-Python-2.7.12'),
 ]
 
 dependencies = [
+    ('zlib', '1.2.8'),
     ('nettle', '3.2'),
-    ('X11', '20160819'),
     ('libdrm', '2.4.70'),
     ('LLVM', '3.8.1'),
+    ('X11', '20160819'),
 ]
 
 # GLU is not part anymore of Mesa package!

From 5f511f644ac6ea66e9dbcdeab7c869d03d235284 Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Thu, 25 Aug 2016 10:18:55 +0200
Subject: [PATCH 08/13] Use EB python in libxml2

---
 .../l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb
index 8f6fcf89928..d326810b205 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb
@@ -18,7 +18,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB --with-python=$EBROOTPYTHON/bin/python'
 
 dependencies = [
     ('zlib', '1.2.8'),

From fae007ae72e5610f76f31de32d638bbdc3fa8831 Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Thu, 1 Sep 2016 09:39:28 +0200
Subject: [PATCH 09/13] Don't build Tkinter in Python as it requires X11

Build the Tk module for Python requires a full X11 stack. We want to
avoid that.
---
 easybuild/easyconfigs/p/Python/Python-2.7.12-intel-2016b.eb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.12-intel-2016b.eb b/easybuild/easyconfigs/p/Python/Python-2.7.12-intel-2016b.eb
index e77dca81729..42a21bb5f77 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.12-intel-2016b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.12-intel-2016b.eb
@@ -18,7 +18,8 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '6.0'),
     ('SQLite', '3.13.0'),
-    ('Tk', '8.6.5'),
+    # We don't build Tkinter as it requires an X11 stack
+    # ('Tk', '8.6.5'),
     ('GMP', '6.1.1'),
     ('libffi', '3.2.1'),
     # OS dependency should be preferred if the os version is more recent then this version,

From 7d1759c4f74c316b81667b6c858c0ef61d80c709 Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Thu, 1 Sep 2016 10:23:33 +0200
Subject: [PATCH 10/13] Use libxml2 easyblock for Python

---
 .../l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb
index d326810b205..c0c3697f83d 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'libxml2'
 version = '2.9.4'
 versionsuffix = '-Python-%(pyver)s'
@@ -18,16 +16,11 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB --with-python=$EBROOTPYTHON/bin/python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
 
 dependencies = [
     ('zlib', '1.2.8'),
     ('Python', '2.7.12'),
 ]
 
-sanity_check_paths = {
-    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
-    'dirs': ['bin', 'include/libxml2/libxml'],
-}
-
 moduleclass = 'lib'

From 39dbbf73496e54c6fbffc51c8333781dfbdd60f6 Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Fri, 2 Sep 2016 15:54:14 +0200
Subject: [PATCH 11/13] Bring libxml2/2.9.4 with Python in sync with the others

---
 .../l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb   | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb
index c0c3697f83d..d2e63d779bd 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.4-intel-2016b-Python-2.7.12.eb
@@ -3,9 +3,8 @@ version = '2.9.4'
 versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://xmlsoft.org/'
-description = """Libxml2 is the XML C parser and
-toolchain developed for the Gnome project
- (but usable outside of the Gnome platform)."""
+description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
+ outside of the Gnome platform)."""
 
 toolchain = {'name': 'intel', 'version': '2016b'}
 toolchainopts = {'pic': True}
@@ -16,8 +15,6 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
-
 dependencies = [
     ('zlib', '1.2.8'),
     ('Python', '2.7.12'),

From 0e868adf2743f0bb9d90876ea6692bccbc85d909 Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Fri, 2 Sep 2016 15:54:59 +0200
Subject: [PATCH 12/13] Still allow Tk but add comment

---
 easybuild/easyconfigs/p/Python/Python-2.7.12-intel-2016b.eb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.12-intel-2016b.eb b/easybuild/easyconfigs/p/Python/Python-2.7.12-intel-2016b.eb
index 42a21bb5f77..9f0f36a46af 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.12-intel-2016b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.12-intel-2016b.eb
@@ -18,8 +18,8 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '6.0'),
     ('SQLite', '3.13.0'),
-    # We don't build Tkinter as it requires an X11 stack
-    # ('Tk', '8.6.5'),
+    # Be ware that this requires a full X11 stack
+    ('Tk', '8.6.5'),
     ('GMP', '6.1.1'),
     ('libffi', '3.2.1'),
     # OS dependency should be preferred if the os version is more recent then this version,

From 8240062fa77b301b1ad4ec9f6922569013579772 Mon Sep 17 00:00:00 2001
From: Ward Poelmans <wpoely86@gmail.com>
Date: Fri, 2 Sep 2016 17:21:00 +0200
Subject: [PATCH 13/13] Drop comments about X11, moved to #3519

---
 easybuild/easyconfigs/p/Python/Python-2.7.12-intel-2016b.eb | 1 -
 easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-no-X11.eb   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.12-intel-2016b.eb b/easybuild/easyconfigs/p/Python/Python-2.7.12-intel-2016b.eb
index 9f0f36a46af..e77dca81729 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.12-intel-2016b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.12-intel-2016b.eb
@@ -18,7 +18,6 @@ dependencies = [
     ('libreadline', '6.3'),
     ('ncurses', '6.0'),
     ('SQLite', '3.13.0'),
-    # Be ware that this requires a full X11 stack
     ('Tk', '8.6.5'),
     ('GMP', '6.1.1'),
     ('libffi', '3.2.1'),
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-no-X11.eb
index ee021a1cfc5..9eede492106 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-no-X11.eb
@@ -20,7 +20,6 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
-# To be clear: this will still require the X11 to be present.
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
 
 start_dir = 'unix'