Merge pull request #32 from boegel/libx11-2016aa

minor style fixes in X lib easyconfigs
easybuilders · Mar 1, 2016 · 3611310 · 3611310
2 parents 178df22 + dabd9c3
commit 3611310
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2016a.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2016a.eb
@@ -18,7 +18,7 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.%s' % SHLIB_EXT]],
+    'files': ['lib/libXau.a', 'lib/libXau.%s' % SHLIB_EXT],
     'dirs': [],
 }
 

diff --git a/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-intel-2016a.eb b/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-intel-2016a.eb
@@ -18,7 +18,7 @@ builddependencies = [
     ('xproto', '7.0.28'),
 ]
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['%(name)s.a', '%(name)s.so']],
+    'files': ['lib/%(name)s.a', 'lib/%%(name)s.%s' % SHLIB_EXT],
     'dirs': [],
 }
 

diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2016a.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2016a.eb
@@ -23,10 +23,10 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
-                                             "-randr", "-record", "-render", "-res", "-screensaver",
-                                             "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
-                                             "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
+    'files': ['lib/libxcb%s.a' % x for x in ['', '-composite', '-damage', '-dpms', '-dri2', '-glx',
+                                             '-randr', '-record', '-render', '-res', '-screensaver',
+                                             '-shape', '-shm', '-sync', '-xevie', '-xf86dri', '-xfixes',
+                                             '-xinerama', '-xprint', '-xtest', '-xv', '-xvmc']],
     'dirs': ['include/xcb', 'lib/pkgconfig'],
 }
 

diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2016a.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2016a.eb
@@ -7,7 +7,6 @@ homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """XExtProto protocol headers."""
 
 toolchain = {'name': 'intel', 'version': '2016a'}
-toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']

diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-intel-2016a.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-intel-2016a.eb
@@ -9,7 +9,6 @@ description = """xtrans includes a number of routines to make X implementations
 """
 
 toolchain = {'name': 'intel', 'version': '2016a'}
-toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]