From 389b828484629dded88e69bf850de8c6a6b4ad58 Mon Sep 17 00:00:00 2001
From: Easy Build <easybuild@login4.smc.salomon.it4i.cz>
Date: Thu, 22 Jun 2017 09:58:30 +0200
Subject: [PATCH] 	modified:   i/ifort/ifort-2017.1.132-GCC-6.3.0-2.27.eb
 	new file:   o/OpenMPI/OpenMPI-1.10.7-GCC-6.3.0-2.27-noPBS.eb 	new
 file:   p/protobuf/protobuf-3.2.0-Python-3.6.1.eb 	modified:  
 x/X11/X11-20170314.eb

---
 i/ifort/ifort-2017.1.132-GCC-6.3.0-2.27.eb    |  2 +-
 .../OpenMPI-1.10.7-GCC-6.3.0-2.27-noPBS.eb    | 46 +++++++++++++++++++
 p/protobuf/protobuf-3.2.0-Python-3.6.1.eb     | 37 +++++++++++++++
 x/X11/X11-20170314.eb                         |  5 ++
 4 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 o/OpenMPI/OpenMPI-1.10.7-GCC-6.3.0-2.27-noPBS.eb
 create mode 100644 p/protobuf/protobuf-3.2.0-Python-3.6.1.eb

diff --git a/i/ifort/ifort-2017.1.132-GCC-6.3.0-2.27.eb b/i/ifort/ifort-2017.1.132-GCC-6.3.0-2.27.eb
index b99c9e9e..0c53798b 100644
--- a/i/ifort/ifort-2017.1.132-GCC-6.3.0-2.27.eb
+++ b/i/ifort/ifort-2017.1.132-GCC-6.3.0-2.27.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['parallel_studio_xe_%(version_major)s_update%(version_minor)s_composer_edition_for_fortran.tgz']
 
-checksums = ['612169f4b40cdded8e212bf097925e4f']
+#checksums = ['612169f4b40cdded8e212bf097925e4f']
 
 # remove dependency on intel-mpi-rt-mic
 patches = ['ifort_2017_no_mpi_mic_dependency.patch']
diff --git a/o/OpenMPI/OpenMPI-1.10.7-GCC-6.3.0-2.27-noPBS.eb b/o/OpenMPI/OpenMPI-1.10.7-GCC-6.3.0-2.27-noPBS.eb
new file mode 100644
index 00000000..1374ac9b
--- /dev/null
+++ b/o/OpenMPI/OpenMPI-1.10.7-GCC-6.3.0-2.27-noPBS.eb
@@ -0,0 +1,46 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '1.10.7'
+versionsuffix = '-noPBS'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'GCC', 'version': '6.3.0-2.27'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+
+dependencies = [('hwloc', '1.11.7')]
+
+builddependencies = [
+            ('Java', '1.8.0_121', '', True)
+]
+
+configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-verbs '
+configopts += '--enable-mpirun-prefix-by-default '  # suppress failure modes in relation to mpirun path
+configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
+configopts += '--disable-dlopen '  # statically link component, don't do dynamic loading
+#configopts += '--with-tm=/opt/pbs/default '  # Enable PBS
+configopts += '--enable-mpi-java ' # Java support RT#4090
+
+# for PBS Pro 13
+# preconfigopts = 'export LIBS="-ldl" && '
+
+# needed for --with-verbs
+osdependencies = [('libibverbs-dev', 'libibverbs-devel')]
+
+libs = ["mpi_cxx", "mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]
+sanity_check_paths = {
+    'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
+             ["lib/lib%s.%s" % (libfile, SHLIB_EXT) for libfile in libs] +
+             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]],
+    'dirs': ["include/openmpi/ompi/mpi/cxx"],
+}
+
+modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx4_0',
+                'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
+}
+
+moduleclass = 'mpi'
diff --git a/p/protobuf/protobuf-3.2.0-Python-3.6.1.eb b/p/protobuf/protobuf-3.2.0-Python-3.6.1.eb
new file mode 100644
index 00000000..e72f414a
--- /dev/null
+++ b/p/protobuf/protobuf-3.2.0-Python-3.6.1.eb
@@ -0,0 +1,37 @@
+easyblock = 'ConfigureMake'
+
+name = 'protobuf'
+version = '3.2.0'
+versionsuffix = '-Python-3.6.1'
+
+homepage = 'https://code.google.com/p/protobuf/'
+description = """Google Protocol Buffers"""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['%(name)s-python-%(version)s.tar.gz']
+source_urls = ['https://github.com/google/protobuf/releases/download/v%(version)s/']
+
+builddependencies = [
+    ('GCC', '4.9.3-tf'),
+]
+
+dependencies = [
+    ('Python', '3.6.1'),
+]
+
+# after instalation: python3 setup.py install --cpp_implementation
+postinstallcmds = [
+    'cp %(builddir)s/%(name)s-%(version)s/  %(installdir)s/build -R',
+]
+
+sanity_check_paths = {
+    'files': ['bin/protoc'],
+    'dirs': [],
+}
+
+modextravars = {
+    'PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION': 'cpp',
+}
+
+moduleclass = 'devel'
diff --git a/x/X11/X11-20170314.eb b/x/X11/X11-20170314.eb
index 2fddbf85..f83476ff 100644
--- a/x/X11/X11-20170314.eb
+++ b/x/X11/X11-20170314.eb
@@ -124,6 +124,11 @@ pyshortver = '.'.join(SYS_PYTHON_VERSION.split('.')[0:2])
 
 preconfigopts = "if [ ! -f configure ]; then ./autogen.sh; fi && "
 
+#xkbcommon configuration dir
+postinstallcmds = [
+	'ln -s %(installdir)s/share/xcb %(installdir)s/share/X11/xkb'
+]
+
 # specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
 full_sanity_check = True