Skip to content

use xorg-macros as dependency in X11 easyconfigs (rather than installing it as a bundle component) #9546

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

Merged
boegel merged 3 commits into from
Dec 25, 2019
Merged

use xorg-macros as dependency in X11 easyconfigs (rather than installing it as a bundle component) #9546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0385fd1
Use xorg-macros ECs to fix URL errors
Flamefire Dec 18, 2019
d3781b6
Merge branch 'develop' of https://github.com/easybuilders/easybuild-e…
boegel Dec 24, 2019
2bddab2
also clear patches for easyconfigs using Bundle easyblock in check_sh…
boegel Dec 24, 2019
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
13 changes: 4 additions & 9 deletions easybuild/easyconfigs/x/X11/X11-20160819-foss-2016b.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ toolchain = {'name': 'foss', 'version': '2016b'}
source_urls = [
XORG_LIB_SOURCE,
XORG_PROTO_SOURCE,
'http://xcb.freedesktop.org/dist/',
'http://xkbcommon.org/download/',
'http://cgit.freedesktop.org/xorg/util/macros/snapshot',
'https://xcb.freedesktop.org/dist/',
'https://xkbcommon.org/download/',
XORG_DATA_SOURCE + '/xkeyboard-config',
]

Expand All @@ -22,7 +21,8 @@ builddependencies = [
('Bison', '3.0.4'),
('gettext', '0.19.8'),
('pkg-config', '0.29.1'),
('intltool', '0.51.0', '-Perl-5.24.0')
('intltool', '0.51.0', '-Perl-5.24.0'),
('xorg-macros', '1.19.0'),
]
dependencies = [
('freetype', '2.6.5'),
Expand All @@ -38,11 +38,6 @@ default_component_specs = {
'start_dir': '%(name)s-%(version)s',
}
components = [
('xorg-macros', '1.19.0', { # 2014-03-27
'sources': ['util-macros-%(version)s.tar.gz'],
'checksums': ['9cca766593cc0ce6bffe1e503127e047aafce61891e4de26b591c86f603af623'],
'start_dir': 'util-macros-%(version)s',
}),
('libpthread-stubs', '0.3', { # 2009-10-14
'checksums': ['3031f466cf0b06de6b3ccbf2019d15c4fcf75229b7d226a711bc1885b3a82cde'],
}),
Expand Down
13 changes: 4 additions & 9 deletions easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ toolchain = {'name': 'intel', 'version': '2016b'}
source_urls = [
XORG_LIB_SOURCE,
XORG_PROTO_SOURCE,
'http://xcb.freedesktop.org/dist/',
'http://xkbcommon.org/download/',
'http://cgit.freedesktop.org/xorg/util/macros/snapshot',
'https://xcb.freedesktop.org/dist/',
'https://xkbcommon.org/download/',
XORG_DATA_SOURCE + '/xkeyboard-config',
]

Expand All @@ -22,7 +21,8 @@ builddependencies = [
('Bison', '3.0.4'),
('gettext', '0.19.8'),
('pkg-config', '0.29.1'),
('intltool', '0.51.0', '-Perl-5.24.0')
('intltool', '0.51.0', '-Perl-5.24.0'),
('xorg-macros', '1.19.0'),
]
dependencies = [
('freetype', '2.6.5'),
Expand All @@ -38,11 +38,6 @@ default_component_specs = {
'start_dir': '%(name)s-%(version)s',
}
components = [
('xorg-macros', '1.19.0', { # 2014-03-27
'sources': ['util-macros-%(version)s.tar.gz'],
'checksums': ['9cca766593cc0ce6bffe1e503127e047aafce61891e4de26b591c86f603af623'],
'start_dir': 'util-macros-%(version)s',
}),
('libpthread-stubs', '0.3', { # 2009-10-14
'checksums': ['3031f466cf0b06de6b3ccbf2019d15c4fcf75229b7d226a711bc1885b3a82cde'],
}),
Expand Down
13 changes: 4 additions & 9 deletions easybuild/easyconfigs/x/X11/X11-20170129-GCCcore-6.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ toolchain = {'name': 'GCCcore', 'version': '6.3.0'}
source_urls = [
XORG_LIB_SOURCE,
XORG_PROTO_SOURCE,
'http://xcb.freedesktop.org/dist/',
'http://xkbcommon.org/download/',
'http://cgit.freedesktop.org/xorg/util/macros/snapshot',
'https://xcb.freedesktop.org/dist/',
'https://xkbcommon.org/download/',
XORG_DATA_SOURCE + '/xkeyboard-config',
XORG_DATA_SOURCE,
]
Expand All @@ -23,6 +22,7 @@ dependencies = [
('fontconfig', '2.12.1'),
('freetype', '2.7.1'),
('zlib', '1.2.11'),
('xorg-macros', '1.19.1'),
]
builddependencies = [
# use same binutils version that was used when building GCCcore toolchain
Expand All @@ -31,7 +31,7 @@ builddependencies = [
('Bison', '3.0.4'),
('gettext', '0.19.8.1'),
('pkg-config', '0.29.1'),
('intltool', '0.51.0', '-Perl-5.24.1')
('intltool', '0.51.0', '-Perl-5.24.1'),
]

default_easyblock = 'ConfigureMake'
Expand All @@ -41,11 +41,6 @@ default_component_specs = {
'start_dir': '%(name)s-%(version)s',
}
components = [
('xorg-macros', '1.19.1', { # 2017-01-29
'sources': ['util-macros-%(version)s.tar.gz'],
'checksums': ['f056411c49a9955f141cad4d7b258a1a5e5bcc0f2a197ee00c63ac3bbe9f347a'],
'start_dir': 'util-macros-%(version)s',
}),
('libpthread-stubs', '0.3', { # 2009-10-14
'checksums': ['3031f466cf0b06de6b3ccbf2019d15c4fcf75229b7d226a711bc1885b3a82cde'],
}),
Expand Down
13 changes: 4 additions & 9 deletions easybuild/easyconfigs/x/X11/X11-20170314-GCCcore-6.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ toolchain = {'name': 'GCCcore', 'version': '6.3.0'}
source_urls = [
XORG_LIB_SOURCE,
XORG_PROTO_SOURCE,
'http://xcb.freedesktop.org/dist/',
'http://xkbcommon.org/download/',
'http://cgit.freedesktop.org/xorg/util/macros/snapshot',
'https://xcb.freedesktop.org/dist/',
'https://xkbcommon.org/download/',
XORG_DATA_SOURCE + '/xkeyboard-config',
XORG_DATA_SOURCE,
]
Expand All @@ -23,6 +22,7 @@ dependencies = [
('fontconfig', '2.12.1', '-libpng-1.6.29'),
('freetype', '2.7.1', '-libpng-1.6.29'),
('zlib', '1.2.11'),
('xorg-macros', '1.19.1'),
]
builddependencies = [
# use same binutils version that was used when building GCCcore toolchain
Expand All @@ -31,7 +31,7 @@ builddependencies = [
('Bison', '3.0.4'),
('gettext', '0.19.8.1'),
('pkg-config', '0.29.1'),
('intltool', '0.51.0', '-Perl-5.24.1')
('intltool', '0.51.0', '-Perl-5.24.1'),
]

default_easyblock = 'ConfigureMake'
Expand All @@ -42,11 +42,6 @@ default_component_specs = {
'start_dir': '%(name)s-%(version)s',
}
components = [
('xorg-macros', '1.19.1', { # 2017-01-29
'sources': ['util-macros-%(version)s.tar.gz'],
'checksums': ['f056411c49a9955f141cad4d7b258a1a5e5bcc0f2a197ee00c63ac3bbe9f347a'],
'start_dir': 'util-macros-%(version)s',
}),
('libpthread-stubs', '0.4', { # 2017-03-14
'checksums': ['50d5686b79019ccea08bcbd7b02fe5a40634abcfd4146b6e75c6420cc170e9d9'],
}),
Expand Down
13 changes: 4 additions & 9 deletions easybuild/easyconfigs/x/X11/X11-20171023-GCCcore-6.4.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ toolchain = {'name': 'GCCcore', 'version': '6.4.0'}
source_urls = [
XORG_LIB_SOURCE,
XORG_PROTO_SOURCE,
'http://xcb.freedesktop.org/dist/',
'http://xkbcommon.org/download/',
'http://cgit.freedesktop.org/xorg/util/macros/snapshot',
'https://xcb.freedesktop.org/dist/',
'https://xkbcommon.org/download/',
XORG_DATA_SOURCE + '/xkeyboard-config',
XORG_DATA_SOURCE,
]
Expand All @@ -23,6 +22,7 @@ dependencies = [
('fontconfig', '2.12.4'),
('freetype', '2.8'),
('zlib', '1.2.11'),
('xorg-macros', '1.19.1'),
]
builddependencies = [
# use same binutils version that was used when building GCCcore toolchain
Expand All @@ -31,7 +31,7 @@ builddependencies = [
('Bison', '3.0.4'),
('gettext', '0.19.8.1'),
('pkg-config', '0.29.2'),
('intltool', '0.51.0', '-Perl-5.26.0')
('intltool', '0.51.0', '-Perl-5.26.0'),
]

default_easyblock = 'ConfigureMake'
Expand All @@ -41,11 +41,6 @@ default_component_specs = {
'start_dir': '%(name)s-%(version)s',
}
components = [
('xorg-macros', '1.19.1', { # 2017-01-29
'sources': ['util-macros-%(version)s.tar.gz'],
'checksums': ['f056411c49a9955f141cad4d7b258a1a5e5bcc0f2a197ee00c63ac3bbe9f347a'],
'start_dir': 'util-macros-%(version)s',
}),
('libpthread-stubs', '0.4', { # 2017-03-14
'checksums': ['50d5686b79019ccea08bcbd7b02fe5a40634abcfd4146b6e75c6420cc170e9d9'],
}),
Expand Down
11 changes: 3 additions & 8 deletions easybuild/easyconfigs/x/X11/X11-20180131-GCCcore-6.4.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ toolchain = {'name': 'GCCcore', 'version': '6.4.0'}
source_urls = [
XORG_LIB_SOURCE,
XORG_PROTO_SOURCE,
'http://xcb.freedesktop.org/dist/',
'http://xkbcommon.org/download/',
'http://cgit.freedesktop.org/xorg/util/macros/snapshot',
'https://xcb.freedesktop.org/dist/',
'https://xkbcommon.org/download/',
XORG_DATA_SOURCE + '/xkeyboard-config',
XORG_DATA_SOURCE,
]
Expand All @@ -23,6 +22,7 @@ dependencies = [
('fontconfig', '2.12.6'),
('freetype', '2.9'),
('zlib', '1.2.11'),
('xorg-macros', '1.19.1'),
]
builddependencies = [
# use same binutils version that was used when building GCCcore toolchain
Expand All @@ -41,11 +41,6 @@ default_component_specs = {
'start_dir': '%(name)s-%(version)s',
}
components = [
('xorg-macros', '1.19.1', { # 2017-01-29
'sources': ['util-macros-%(version)s.tar.gz'],
'checksums': ['f056411c49a9955f141cad4d7b258a1a5e5bcc0f2a197ee00c63ac3bbe9f347a'],
'start_dir': 'util-macros-%(version)s',
}),
('libpthread-stubs', '0.4', { # 2017-03-14
'checksums': ['50d5686b79019ccea08bcbd7b02fe5a40634abcfd4146b6e75c6420cc170e9d9'],
}),
Expand Down
11 changes: 3 additions & 8 deletions easybuild/easyconfigs/x/X11/X11-20180604-GCCcore-7.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ toolchain = {'name': 'GCCcore', 'version': '7.3.0'}
source_urls = [
XORG_LIB_SOURCE,
XORG_PROTO_SOURCE,
'http://xcb.freedesktop.org/dist/',
'http://xkbcommon.org/download/',
'http://cgit.freedesktop.org/xorg/util/macros/snapshot',
'https://xcb.freedesktop.org/dist/',
'https://xkbcommon.org/download/',
XORG_DATA_SOURCE + '/xkeyboard-config',
XORG_DATA_SOURCE,
]
Expand All @@ -23,6 +22,7 @@ dependencies = [
('fontconfig', '2.13.0'),
('freetype', '2.9.1'),
('zlib', '1.2.11'),
('xorg-macros', '1.19.2'),
]
builddependencies = [
# use same binutils version that was used when building GCCcore toolchain
Expand All @@ -41,11 +41,6 @@ default_component_specs = {
'start_dir': '%(name)s-%(version)s',
}
components = [
('xorg-macros', '1.19.2', { # 2018-03-04
'sources': ['util-macros-%(version)s.tar.gz'],
'checksums': ['5d6e62803c9f20830b28ad8a9800c97a9987635089229e3e380ef3848c84d2a6'],
'start_dir': 'util-macros-%(version)s',
}),
('libpthread-stubs', '0.4', { # 2017-03-14
'checksums': ['50d5686b79019ccea08bcbd7b02fe5a40634abcfd4146b6e75c6420cc170e9d9'],
}),
Expand Down
11 changes: 3 additions & 8 deletions easybuild/easyconfigs/x/X11/X11-20190311-GCCcore-8.2.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ toolchain = {'name': 'GCCcore', 'version': '8.2.0'}
source_urls = [
XORG_LIB_SOURCE,
XORG_PROTO_SOURCE,
'http://xcb.freedesktop.org/dist/',
'http://xkbcommon.org/download/',
'http://cgit.freedesktop.org/xorg/util/macros/snapshot',
'https://xcb.freedesktop.org/dist/',
'https://xkbcommon.org/download/',
XORG_DATA_SOURCE + '/xkeyboard-config',
XORG_DATA_SOURCE,
]
Expand All @@ -23,6 +22,7 @@ dependencies = [
('fontconfig', '2.13.1'),
('freetype', '2.9.1'),
('zlib', '1.2.11'),
('xorg-macros', '1.19.2'),
]
builddependencies = [
('binutils', '2.31.1'),
Expand All @@ -40,11 +40,6 @@ default_component_specs = {
'start_dir': '%(name)s-%(version)s',
}
components = [
('xorg-macros', '1.19.2', { # 2018-03-04
'sources': ['util-macros-%(version)s.tar.gz'],
'checksums': ['5d6e62803c9f20830b28ad8a9800c97a9987635089229e3e380ef3848c84d2a6'],
'start_dir': 'util-macros-%(version)s',
}),
('libpthread-stubs', '0.4', { # 2017-03-14
'checksums': ['50d5686b79019ccea08bcbd7b02fe5a40634abcfd4146b6e75c6420cc170e9d9'],
}),
Expand Down
11 changes: 3 additions & 8 deletions easybuild/easyconfigs/x/X11/X11-20190717-GCCcore-8.3.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ toolchain = {'name': 'GCCcore', 'version': '8.3.0'}
source_urls = [
XORG_LIB_SOURCE,
XORG_PROTO_SOURCE,
'http://xcb.freedesktop.org/dist/',
'http://xkbcommon.org/download/',
'http://cgit.freedesktop.org/xorg/util/macros/snapshot',
'https://xcb.freedesktop.org/dist/',
'https://xkbcommon.org/download/',
XORG_DATA_SOURCE + '/xkeyboard-config',
XORG_DATA_SOURCE,
]
Expand All @@ -23,6 +22,7 @@ dependencies = [
('fontconfig', '2.13.1'),
('freetype', '2.10.1'),
('zlib', '1.2.11'),
('xorg-macros', '1.19.2'),
]
builddependencies = [
('binutils', '2.32'),
Expand All @@ -40,11 +40,6 @@ default_component_specs = {
'start_dir': '%(name)s-%(version)s',
}
components = [
('xorg-macros', '1.19.2', { # 2018-03-04
'sources': ['util-macros-%(version)s.tar.gz'],
'checksums': ['5d6e62803c9f20830b28ad8a9800c97a9987635089229e3e380ef3848c84d2a6'],
'start_dir': 'util-macros-%(version)s',
}),
('libpthread-stubs', '0.4', { # 2017-03-14
'checksums': ['50d5686b79019ccea08bcbd7b02fe5a40634abcfd4146b6e75c6420cc170e9d9'],
}),
Expand Down
3 changes: 2 additions & 1 deletion test/easyconfigs/easyconfigs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,10 +514,11 @@ def check_sha256_checksums(self, changed_ecs):
# for easyconfigs using the Bundle easyblock, this is a problem because the 'sources' easyconfig parameter
# is updated in place (sources for components are added the 'parent' sources) in Bundle's __init__;
# therefore, we need to reset 'sources' to an empty list here if Bundle is used...
# likewise for 'checksums'
# likewise for 'patches' and 'checksums'
for ec in changed_ecs:
if ec['easyblock'] == 'Bundle':
ec['sources'] = []
ec['patches'] = []
ec['checksums'] = []

# filter out deprecated easyconfigs
Expand Down