From f6644ed91896d7a7d17000d33204d46d54ebdf6c Mon Sep 17 00:00:00 2001 From: Balazs Hajgato Date: Tue, 23 Feb 2016 14:23:05 +0100 Subject: [PATCH 01/11] {vis}[intel-2016b] libX11 1.6.3 (REVIEW) --- .../inputproto-2.3.1-intel-2016a.eb | 19 ++++++++++ .../k/kbproto/kbproto-1.0.7-intel-2016a.eb | 19 ++++++++++ .../l/libX11/libX11-1.6.3-intel-2016a.eb | 37 +++++++++++++++++++ .../l/libXau/libXau-1.0.8-intel-2016a.eb | 25 +++++++++++++ .../libpthread-stubs-0.3-intel-2016a.eb | 20 ++++++++++ .../l/libxcb/libxcb-1.11.1-intel-2016a.eb | 31 ++++++++++++++++ ...cb-proto-1.11-intel-2016a-Python-2.7.11.eb | 27 ++++++++++++++ .../xextproto/xextproto-7.3.0-intel-2016a.eb | 25 +++++++++++++ .../x/xproto/xproto-7.0.28-intel-2016a.eb | 23 ++++++++++++ .../x/xtrans/xtrans-1.3.5-intel-2016a.eb | 23 ++++++++++++ 10 files changed, 249 insertions(+) create mode 100644 easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-intel-2016a.eb create mode 100644 easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-intel-2016a.eb create mode 100644 easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2016a.eb create mode 100644 easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2016a.eb create mode 100644 easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-intel-2016a.eb create mode 100644 easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2016a.eb create mode 100644 easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb create mode 100644 easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2016a.eb create mode 100644 easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2016a.eb create mode 100644 easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-intel-2016a.eb diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-intel-2016a.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-intel-2016a.eb new file mode 100644 index 00000000000..323816dd0b5 --- /dev/null +++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-intel-2016a.eb @@ -0,0 +1,19 @@ +easyblock = 'ConfigureMake' + +name = 'inputproto' +version = '2.3.1' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """X.org InputProto protocol headers.""" + +toolchain = {'name': 'intel', 'version': '2016a'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] + +sanity_check_paths = { + 'files': ['include/X11/extensions/%s' % x for x in ['XI2.h', 'XI.h', 'XIproto.h', 'XI2proto.h']], + 'dirs': [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-intel-2016a.eb b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-intel-2016a.eb new file mode 100644 index 00000000000..29d6a6987af --- /dev/null +++ b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-intel-2016a.eb @@ -0,0 +1,19 @@ +easyblock = 'ConfigureMake' + +name = 'kbproto' +version = '1.0.7' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """X.org KBProto protocol headers.""" + +toolchain = {'name': 'intel', 'version': '2016a'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] + +sanity_check_paths = { + 'files': ['include/X11/extensions/%s' % x for x in ['XKBgeom.h', 'XKB.h', 'XKBproto.h', 'XKBsrv.h', 'XKBstr.h']], + 'dirs': [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2016a.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2016a.eb new file mode 100644 index 00000000000..abaa07d7cfc --- /dev/null +++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2016a.eb @@ -0,0 +1,37 @@ +easyblock = 'ConfigureMake' + +name = 'libX11' +version = '1.6.3' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """X11 client-side library""" + +toolchain = {'name': 'intel', 'version': '2016a'} + +sources = [SOURCE_TAR_GZ] +source_urls = [XORG_LIB_SOURCE] + +builddependencies = [ + ('xextproto', '7.3.0'), + ('xcb-proto', '1.11', '-Python-2.7.11'), + ('inputproto', '2.3.1'), + ('xproto', '7.0.28'), + ('libpthread-stubs', '0.3'), + ('kbproto', '1.0.7'), + ('xtrans', '1.3.5'), +] + +dependencies = [ + ('libxcb', '1.11.1'), +] + +sanity_check_paths = { + 'files': ['include/X11/%s' % x for x in [ + 'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h', + 'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h', + ] + ], + 'dirs': [], +} + +moduleclass = 'vis' 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 new file mode 100644 index 00000000000..cca4ea14381 --- /dev/null +++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2016a.eb @@ -0,0 +1,25 @@ +easyblock = 'ConfigureMake' + +name = 'libXau' +version = '1.0.8' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """The libXau package contains a library implementing the X11 Authorization Protocol. +This is useful for restricting client access to the display.""" + +toolchain = {'name': 'intel', 'version': '2016a'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +builddependencies = [ + ('xproto', '7.0.28'), +] + +sanity_check_paths = { + 'files': ['lib/%s' % x for x in ['libXau.a', 'libXau.%s' % SHLIB_EXT]], + 'dirs': [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-intel-2016a.eb b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-intel-2016a.eb new file mode 100644 index 00000000000..afc12256908 --- /dev/null +++ b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-intel-2016a.eb @@ -0,0 +1,20 @@ +easyblock = 'ConfigureMake' + +name = 'libpthread-stubs' +version = '0.3' + +homepage = 'http://xcb.freedesktop.org/' +description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, +latency hiding, direct access to the protocol, improved threading support, and extensibility.""" + +source_urls = ['http://xcb.freedesktop.org/dist/'] +sources = [SOURCELOWER_TAR_GZ] + +toolchain = {'name': 'intel', 'version': '2016a'} + +sanity_check_paths = { + 'files': ['lib/pkgconfig/pthread-stubs.pc'], + 'dirs': [], +} + +moduleclass = 'lib' 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 new file mode 100644 index 00000000000..0a842ce83c1 --- /dev/null +++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2016a.eb @@ -0,0 +1,31 @@ +easyblock = 'ConfigureMake' + +name = 'libxcb' +version = '1.11.1' + +homepage = 'http://xcb.freedesktop.org/' +description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, +latency hiding, direct access to the protocol, improved threading support, and extensibility.""" + +toolchain = {'name': 'intel', 'version': '2016a'} + +source_urls = ['http://xcb.freedesktop.org/dist/'] +sources = [SOURCELOWER_TAR_GZ] + +builddependencies = [ + ('xcb-proto', '1.11', '-Python-2.7.11'), + ('libpthread-stubs', '0.3'), +] +dependencies = [ + ('libXau', '1.0.8'), +] + +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"]], + 'dirs': ['include/xcb', 'lib/pkgconfig'], +} + +moduleclass = 'lib' diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb new file mode 100644 index 00000000000..80c7b50387d --- /dev/null +++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb @@ -0,0 +1,27 @@ +easyblock = 'ConfigureMake' + +name = 'xcb-proto' +version = '1.11' + +homepage = 'http://xcb.freedesktop.org/' +description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, +latency hiding, direct access to the protocol, improved threading support, and extensibility.""" + +toolchain = {'name': 'intel', 'version': '2016a'} + +source_urls = ['http://xcb.freedesktop.org/dist/'] +sources = [SOURCELOWER_TAR_GZ] + +python = 'Python' +pyver = '2.7.11' +versionsuffix = '-%s-%s' % (python, pyver) +builddependencies = [(python, pyver)] + +pyshortver = '.'.join(pyver.split('.')[0:2]) + +sanity_check_paths = { + 'files': ['lib/pkgconfig/xcb-proto.pc'], + 'dirs': ['lib/python%s/site-packages/xcbgen' % pyshortver] +} + +moduleclass = 'devel' 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 new file mode 100644 index 00000000000..dcc6160700c --- /dev/null +++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2016a.eb @@ -0,0 +1,25 @@ +easyblock = 'ConfigureMake' + +name = 'xextproto' +version = '7.3.0' + +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/'] + +sanity_check_paths = { + 'files': ['include/X11/extensions/%s' % x for x in [ + 'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h', + 'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h', + 'xtestconst.h', 'xtestext1proto.h' + ] + ], + 'dirs': [] +} + +moduleclass = 'devel' diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2016a.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2016a.eb new file mode 100644 index 00000000000..1d3df458a71 --- /dev/null +++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2016a.eb @@ -0,0 +1,23 @@ +easyblock = 'ConfigureMake' + +name = 'xproto' +version = '7.0.28' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = "X protocol and ancillary headers" + +toolchain = {'name': 'intel', 'version': '2016a'} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/'] + +sanity_check_paths = { + 'files': ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h', + 'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h', + 'Xw32defs.h', 'Xwindows.h', 'DECkeysym.h', 'keysymdef.h', 'Sunkeysym.h', 'Xarch.h', + 'Xdefs.h', 'Xfuncproto.h', 'X.h', 'Xosdefs.h', 'Xos_r.h', 'Xproto.h', 'Xthreads.h', + 'XWDFile.h', 'Xwinsock.h']], + 'dirs': [] +} + +moduleclass = 'devel' 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 new file mode 100644 index 00000000000..217429b1abf --- /dev/null +++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-intel-2016a.eb @@ -0,0 +1,23 @@ +easyblock = 'ConfigureMake' + +name = 'xtrans' +version = '1.3.5' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """xtrans includes a number of routines to make X implementations transport-independent; + at time of writing, it includes support for UNIX sockets, IPv4, IPv6, and DECnet. +""" + +toolchain = {'name': 'intel', 'version': '2016a'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = [XORG_LIB_SOURCE] + +sanity_check_paths = { + 'files': ['include/X11/Xtrans/%s' % x for x in ['transport.c', 'Xtrans.c', 'Xtrans.h', 'Xtransint.h', + 'Xtranslcl.c', 'Xtranssock.c', 'Xtransutil.c']], + 'dirs': [], +} + +moduleclass = 'devel' From 6b5d0f1a13edc489f1891040fcef60a7be877098 Mon Sep 17 00:00:00 2001 From: Balazs Hajgato Date: Thu, 25 Feb 2016 07:50:03 +0100 Subject: [PATCH 02/11] added xproto as builddep for libxcb (needed by libXau) --- easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2016a.eb | 1 + 1 file changed, 1 insertion(+) 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 index 0a842ce83c1..f95256fd360 100644 --- a/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2016a.eb +++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2016a.eb @@ -14,6 +14,7 @@ sources = [SOURCELOWER_TAR_GZ] builddependencies = [ ('xcb-proto', '1.11', '-Python-2.7.11'), + ('xproto', '7.0.28'), ('libpthread-stubs', '0.3'), ] dependencies = [ From 2271ac6e1a3e0de4a61166fbe3332732fd6182c5 Mon Sep 17 00:00:00 2001 From: Balazs Hajgato Date: Thu, 25 Feb 2016 10:42:30 +0100 Subject: [PATCH 03/11] added libXdmcp as dep for libxcb --- .../l/libXdmcp/libXdmcp-1.1.2-intel-2016a.eb | 25 +++++++++++++++++++ .../l/libxcb/libxcb-1.11.1-intel-2016a.eb | 1 + 2 files changed, 26 insertions(+) create mode 100644 easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-intel-2016a.eb 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 new file mode 100644 index 00000000000..248b0fbfbcb --- /dev/null +++ b/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-intel-2016a.eb @@ -0,0 +1,25 @@ +easyblock = 'ConfigureMake' + +name = 'libXdmcp' +version = '1.1.2' + +homepage = "http://www.freedesktop.org/wiki/Software/xlibs" +description = """The libXdmcp package contains a library implementing the X Display Manager Control Protocol. This is +useful for allowing clients to interact with the X Display Manager. +""" + +toolchain = {'name': 'intel', 'version': '2016a'} +toolchainopts = {'optarch': True} + +sources = [SOURCE_TAR_GZ] +source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/'] + +builddependencies = [ + ('xproto', '7.0.28'), +] +sanity_check_paths = { + 'files': ['lib/%s' % x for x in ['%(name)s.a', '%(name)s.so']], + 'dirs': [], +} + +moduleclass = 'vis' 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 index f95256fd360..0a6fed4f0e3 100644 --- a/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2016a.eb +++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2016a.eb @@ -19,6 +19,7 @@ builddependencies = [ ] dependencies = [ ('libXau', '1.0.8'), + ('libXdmcp', '1.1.2'), ] sanity_check_paths = { From 8c0dab16657a63779f5f1ab23d30528a131fe803 Mon Sep 17 00:00:00 2001 From: Balazs Hajgato Date: Fri, 26 Feb 2016 13:37:19 +0100 Subject: [PATCH 04/11] Python added as dep instead of builddep for xcb-proto --- .../x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb index 80c7b50387d..ab4aaa83ac1 100644 --- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb +++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb @@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ] python = 'Python' pyver = '2.7.11' versionsuffix = '-%s-%s' % (python, pyver) -builddependencies = [(python, pyver)] +dependencies = [(python, pyver)] pyshortver = '.'.join(pyver.split('.')[0:2]) From b31fab3acd0c8a686836236940bdf97239e5fede Mon Sep 17 00:00:00 2001 From: Balazs Hajgato Date: Fri, 26 Feb 2016 15:32:15 +0100 Subject: [PATCH 05/11] add xcb-proto with system python dep (toolchainless) --- .../l/libxcb/libxcb-1.11.1-intel-2016a.eb | 2 ++ .../easyconfigs/x/xcb-proto/xcb-proto-1.11.eb | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11.eb 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 index 0a6fed4f0e3..faa9778d640 100644 --- a/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2016a.eb +++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2016a.eb @@ -14,6 +14,8 @@ sources = [SOURCELOWER_TAR_GZ] builddependencies = [ ('xcb-proto', '1.11', '-Python-2.7.11'), + # Alternatively, you can use xcb-proto using system Python: + #('xcb-proto', 1.11', '', ('dummy', 'dummy')) ('xproto', '7.0.28'), ('libpthread-stubs', '0.3'), ] diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11.eb new file mode 100644 index 00000000000..27a89ed0051 --- /dev/null +++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11.eb @@ -0,0 +1,24 @@ +easyblock = 'ConfigureMake' + +name = 'xcb-proto' +version = '1.11' + +homepage = 'http://xcb.freedesktop.org/' +description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, +latency hiding, direct access to the protocol, improved threading support, and extensibility.""" + +toolchain = {'name': 'dummy', 'version': 'dummy'} + +source_urls = ['http://xcb.freedesktop.org/dist/'] +sources = [SOURCELOWER_TAR_GZ] + +allow_system_deps = [('Python', SYS_PYTHON_VERSION)] + +pyshortver = '.'.join(SYS_PYTHON_VERSION.split('.')[0:2]) + +sanity_check_paths = { + 'files': ['lib/pkgconfig/xcb-proto.pc'], + 'dirs': ['lib/python%s/site-packages/xcbgen' % pyshortver] +} + +moduleclass = 'devel' From d24df53180230f32708ac4364cedcf6d63710433 Mon Sep 17 00:00:00 2001 From: Balazs Hajgato Date: Fri, 26 Feb 2016 15:37:36 +0100 Subject: [PATCH 06/11] use of 'pyver' template --- .../xcb-proto-1.11-intel-2016a-Python-2.7.11.eb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb index ab4aaa83ac1..97ddefed625 100644 --- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb +++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb @@ -12,16 +12,12 @@ toolchain = {'name': 'intel', 'version': '2016a'} source_urls = ['http://xcb.freedesktop.org/dist/'] sources = [SOURCELOWER_TAR_GZ] -python = 'Python' -pyver = '2.7.11' -versionsuffix = '-%s-%s' % (python, pyver) -dependencies = [(python, pyver)] - -pyshortver = '.'.join(pyver.split('.')[0:2]) +versionsuffix = '-Python-%(pyver)s' +dependencies = [('Python', '2.7.11')] sanity_check_paths = { 'files': ['lib/pkgconfig/xcb-proto.pc'], - 'dirs': ['lib/python%s/site-packages/xcbgen' % pyshortver] + 'dirs': ['lib/python%(pyshortver)s/site-packages/xcbgen' % pyshortver] } moduleclass = 'devel' From 1c72713e304c89211af163e7b5198c679f7efd12 Mon Sep 17 00:00:00 2001 From: Balazs Hajgato Date: Sat, 27 Feb 2016 00:02:38 +0100 Subject: [PATCH 07/11] syntax corrected --- .../x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb index 97ddefed625..67fb1d84ea6 100644 --- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb +++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb @@ -17,7 +17,7 @@ dependencies = [('Python', '2.7.11')] sanity_check_paths = { 'files': ['lib/pkgconfig/xcb-proto.pc'], - 'dirs': ['lib/python%(pyshortver)s/site-packages/xcbgen' % pyshortver] + 'dirs': ['lib/python%(pyshortver)s/site-packages/xcbgen'] } moduleclass = 'devel' From c54e5589cbcb366b1b2b76a4ed2348722307d723 Mon Sep 17 00:00:00 2001 From: Balazs Hajgato Date: Tue, 1 Mar 2016 09:08:09 +0100 Subject: [PATCH 08/11] use system python xcb-proto (with dummy toolchain) --- .../l/libxcb/libxcb-1.11.1-intel-2016a.eb | 4 +--- ...cb-proto-1.11-intel-2016a-Python-2.7.11.eb | 23 ------------------- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb 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 index faa9778d640..fb5897b62dd 100644 --- a/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2016a.eb +++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2016a.eb @@ -13,9 +13,7 @@ source_urls = ['http://xcb.freedesktop.org/dist/'] sources = [SOURCELOWER_TAR_GZ] builddependencies = [ - ('xcb-proto', '1.11', '-Python-2.7.11'), - # Alternatively, you can use xcb-proto using system Python: - #('xcb-proto', 1.11', '', ('dummy', 'dummy')) + ('xcb-proto', '1.11', '', True), ('xproto', '7.0.28'), ('libpthread-stubs', '0.3'), ] diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb deleted file mode 100644 index 67fb1d84ea6..00000000000 --- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb +++ /dev/null @@ -1,23 +0,0 @@ -easyblock = 'ConfigureMake' - -name = 'xcb-proto' -version = '1.11' - -homepage = 'http://xcb.freedesktop.org/' -description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, -latency hiding, direct access to the protocol, improved threading support, and extensibility.""" - -toolchain = {'name': 'intel', 'version': '2016a'} - -source_urls = ['http://xcb.freedesktop.org/dist/'] -sources = [SOURCELOWER_TAR_GZ] - -versionsuffix = '-Python-%(pyver)s' -dependencies = [('Python', '2.7.11')] - -sanity_check_paths = { - 'files': ['lib/pkgconfig/xcb-proto.pc'], - 'dirs': ['lib/python%(pyshortver)s/site-packages/xcbgen'] -} - -moduleclass = 'devel' From 1bc43aa964c4c9b1bbf2248d5179def7f2e3a3eb Mon Sep 17 00:00:00 2001 From: Balazs Hajgato Date: Tue, 1 Mar 2016 09:13:04 +0100 Subject: [PATCH 09/11] added comment for xcb-proto --- easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11.eb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11.eb index 27a89ed0051..6a306d862ec 100644 --- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11.eb +++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11.eb @@ -7,6 +7,8 @@ homepage = 'http://xcb.freedesktop.org/' description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, latency hiding, direct access to the protocol, improved threading support, and extensibility.""" +# even though xcb-proto is installed with configure-make-make install, nothing is actually built; +# only .py files are installed using Python, and some .xlm flies copied, so OK to use dummy toolchain toolchain = {'name': 'dummy', 'version': 'dummy'} source_urls = ['http://xcb.freedesktop.org/dist/'] From 178df22db68499259f8f0b9039d6679e7d0707e7 Mon Sep 17 00:00:00 2001 From: Balazs Hajgato Date: Tue, 1 Mar 2016 09:16:14 +0100 Subject: [PATCH 10/11] libX11 using system python dependent xcb-proto --- easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2016a.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2016a.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2016a.eb index abaa07d7cfc..5df5e13e438 100644 --- a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2016a.eb +++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2016a.eb @@ -13,7 +13,7 @@ source_urls = [XORG_LIB_SOURCE] builddependencies = [ ('xextproto', '7.3.0'), - ('xcb-proto', '1.11', '-Python-2.7.11'), + ('xcb-proto', '1.11', '', True), ('inputproto', '2.3.1'), ('xproto', '7.0.28'), ('libpthread-stubs', '0.3'), From dabd9c350d7c563b0afcfd5ba24418d6e90b2394 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 1 Mar 2016 09:49:09 +0100 Subject: [PATCH 11/11] minor style fixes in X lib easyconfigs --- .../easyconfigs/l/libXau/libXau-1.0.8-intel-2016a.eb | 2 +- .../easyconfigs/l/libXdmcp/libXdmcp-1.1.2-intel-2016a.eb | 2 +- .../easyconfigs/l/libxcb/libxcb-1.11.1-intel-2016a.eb | 8 ++++---- .../x/xextproto/xextproto-7.3.0-intel-2016a.eb | 1 - .../easyconfigs/x/xtrans/xtrans-1.3.5-intel-2016a.eb | 1 - 5 files changed, 6 insertions(+), 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 index cca4ea14381..243dbd6f22b 100644 --- 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 index 248b0fbfbcb..24fc239d5eb 100644 --- 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 index fb5897b62dd..098e8569bb6 100644 --- 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 index dcc6160700c..af65fa2a9dd 100644 --- 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 index 217429b1abf..bb8657a96c5 100644 --- 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]