Merge branch 'it4i-salomon'

x/X11/X11-20170314-test.eb

@@ -28,7 +28,7 @@ dependencies = [
     ('zlib', '1.2.11'),
     ('Mesa', '17.0.2', '', ('intel', '2017a')),
     ('nettle', '3.3', '', ('intel', '2017a')),
-    ('XKeyboardConfig', '2.21'),
+#    ('XKeyboardConfig', '2.21'),
 ]
 builddependencies = [
     ('Autotools', '20150215'),
@@ -49,7 +49,7 @@ common_specs = {
 server_specs = {
     'sources': [SOURCE_TAR_GZ],
     'start_dir': '%(name)s-%(version)s',
-    'configopts': '--disable-glamor --enable-suid-wrapper --disable-systemd-logind',
+    'configopts': '--disable-glamor --enable-suid-wrapper --disable-systemd-logind -enable-install-setuid --with-xkb-path=/apps/all/X11/20170314-test/share/X11/xkb', #--with-xkb-path=%(installdir)s/share/X11/xkb
 }
 
 
@@ -158,9 +158,9 @@ preconfigopts = "if [ ! -f configure ]; then ./autogen.sh; fi && "
 modluafooter = 'add_property("state","testing")'
 
 #xkbcommon configuration dir
-postinstallcmds = [
-	'ln -s %(installdir)s/share/xcb %(installdir)s/share/X11/xkb'
-]
+#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