Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

{vis}[intel-2016a] libX11 1.6.3 (REVIEW) #2549

Merged
merged 12 commits into from
Mar 1, 2016
Merged

{vis}[intel-2016a] libX11 1.6.3 (REVIEW) #2549

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f6644ed
{vis}[intel-2016b] libX11 1.6.3 (REVIEW)
Feb 23, 2016
6b5d0f1
added xproto as builddep for libxcb (needed by libXau)
Feb 25, 2016
2271ac6
added libXdmcp as dep for libxcb
Feb 25, 2016
8c0dab1
Python added as dep instead of builddep for xcb-proto
Feb 26, 2016
b31fab3
add xcb-proto with system python dep (toolchainless)
Feb 26, 2016
d24df53
use of 'pyver' template
Feb 26, 2016
1c72713
syntax corrected
Feb 26, 2016
c54e558
use system python xcb-proto (with dummy toolchain)
Mar 1, 2016
1bc43aa
added comment for xcb-proto
Mar 1, 2016
178df22
libX11 using system python dependent xcb-proto
Mar 1, 2016
dabd9c3
minor style fixes in X lib easyconfigs
boegel Mar 1, 2016
3611310
Merge pull request #32 from boegel/libx11-2016aa
Mar 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-intel-2016a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
19 changes: 19 additions & 0 deletions easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-intel-2016a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
37 changes: 37 additions & 0 deletions easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2016a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hajgato: you missed updating this to use the dummy xcb-proto easyconfig?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@boegel aarghhh.

('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'
25 changes: 25 additions & 0 deletions easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2016a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
25 changes: 25 additions & 0 deletions easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-intel-2016a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
20 changes: 20 additions & 0 deletions easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-intel-2016a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
35 changes: 35 additions & 0 deletions easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2016a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
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'),
# Alternatively, you can use xcb-proto using system Python:
#('xcb-proto', 1.11', '', ('dummy', 'dummy'))
('xproto', '7.0.28'),
('libpthread-stubs', '0.3'),
]
dependencies = [
('libXau', '1.0.8'),
('libXdmcp', '1.1.2'),
]

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'
23 changes: 23 additions & 0 deletions easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2016a-Python-2.7.11.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
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'
24 changes: 24 additions & 0 deletions easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add a comment above why it's OK to use dummy here (even though the easyblock we use if ConfigureMake)

# even though xcb-proto is installed with configure-make-make install, nothing is actually built;
# only .py files are copied, so OK to use dummy toolchain
toolchain = ...


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]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is an issue...

if the system Python is updated from 2.6 to 2.7, this will not be found anymore?

besides, this is not in $PYTHONPATH anyway, as it is now (same issue when we include our own Python version)...

does that mean the Python bits are basically irrelevant?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or maybe this is handled via the pkg-config file?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@boegel: this handled by the pkgconfig:
xcb-proto.pc:

prefix=/apps/brussel/ivybridge/software/xcb-proto/1.11
exec_prefix=${prefix}
datarootdir=${prefix}/share
datadir=${datarootdir}
libdir=${exec_prefix}/lib
xcbincludedir=${datadir}/xcb
pythondir=${prefix}/lib/python2.6/site-packages

Name: XCB Proto
Description: X protocol descriptions for XCB
Version: 1.11

I am more concerned what will happen with the precompiled pyo files if you change Python version. (especially, if they are read-only)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@boegel:
xcb-proto has only python bits, so they cannot be irrelevant....

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, not a problem indeed since it's handled by pkg-config

}

moduleclass = 'devel'
25 changes: 25 additions & 0 deletions easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2016a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
23 changes: 23 additions & 0 deletions easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2016a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
23 changes: 23 additions & 0 deletions easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-intel-2016a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'