diff --git a/Golden_Repo/l/libpciaccess/libpciaccess-0.16-GCCcore-9.3.0.eb b/Golden_Repo/l/libpciaccess/libpciaccess-0.16-GCCcore-9.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5a9c81fc7c5579cee7dd356be7be8813a2fd978c
--- /dev/null
+++ b/Golden_Repo/l/libpciaccess/libpciaccess-0.16-GCCcore-9.3.0.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'libpciaccess'
+version = '0.16'
+
+homepage = 'https://cgit.freedesktop.org/xorg/lib/libpciaccess/'
+description = """Generic PCI access library."""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
+
+source_urls = ['https://www.x.org/releases/individual/lib/']
+sources = [SOURCE_TAR_GZ]
+checksums = ['84413553994aef0070cf420050aa5c0a51b1956b404920e21b81e96db6a61a27']
+
+builddependencies = [
+ ('binutils', '2.34'),
+ ('Autotools', '20200321'),
+ ('xorg-macros', '1.19.2'),
+]
+
+sanity_check_paths = {
+ 'files': ['include/pciaccess.h', 'lib/libpciaccess.a'],
+ 'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'system'
diff --git a/Golden_Repo/m/Meson/Meson-0.55.0-GCCcore-9.3.0-Python-3.8.5.eb b/Golden_Repo/m/Meson/Meson-0.55.0-GCCcore-9.3.0-Python-3.8.5.eb
index 022516dc4f40eb275dc9a0dac78b4fbdb913b4c6..6a5d6f2252c8ecef8c3a91bca45114e9915f4edc 100644
--- a/Golden_Repo/m/Meson/Meson-0.55.0-GCCcore-9.3.0-Python-3.8.5.eb
+++ b/Golden_Repo/m/Meson/Meson-0.55.0-GCCcore-9.3.0-Python-3.8.5.eb
@@ -23,6 +23,10 @@ dependencies = [
('Ninja', '1.10.0'),
]
+download_dep_fail = True
+use_pip = True
+sanity_pip_check = True
+
options = {'modulename': 'mesonbuild'}
sanity_check_paths = {
diff --git a/Golden_Repo/n/Ninja/Ninja-1.10.0-GCCcore-9.3.0.eb b/Golden_Repo/n/Ninja/Ninja-1.10.0-GCCcore-9.3.0.eb
index d27c033fb3aedd8c4ff6d1247638fefa6f08b064..de6033b72cd1cfe3f45de8c05be0817519c6a44a 100644
--- a/Golden_Repo/n/Ninja/Ninja-1.10.0-GCCcore-9.3.0.eb
+++ b/Golden_Repo/n/Ninja/Ninja-1.10.0-GCCcore-9.3.0.eb
@@ -14,11 +14,10 @@ source_urls = ['https://github.com/ninja-build/ninja/archive/']
sources = ['v%(version)s.tar.gz']
builddependencies = [
- ('Python', '3.8.5'),
('binutils', '2.34'),
+ ('Python', '3.8.5'),
]
-
cmds_map = [('.*', "./configure.py --bootstrap")]
files_to_copy = [(['ninja'], 'bin')]
diff --git a/Golden_Repo/x/X11/X11-20200222-GCCcore-9.3.0.eb b/Golden_Repo/x/X11/X11-20200222-GCCcore-9.3.0.eb
index 448f88b89db398f668967cd2fb654d01924656b6..5c83aad285fa670515421ca7de00f4e34724b30e 100644
--- a/Golden_Repo/x/X11/X11-20200222-GCCcore-9.3.0.eb
+++ b/Golden_Repo/x/X11/X11-20200222-GCCcore-9.3.0.eb
@@ -13,23 +13,15 @@ toolchain = {'name': 'GCCcore', 'version': '9.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,
'https://www.x.org/archive/individual/app/',
'https://www.x.org/archive/individual/font/'
]
-dependencies = [
- ('bzip2', '1.0.8'),
- ('fontconfig', '2.13.92'),
- ('freetype', '2.10.1'),
- ('zlib', '1.2.11'),
-]
builddependencies = [
- # use same binutils version that was used when building GCCcore toolchain
('binutils', '2.34'),
('Autotools', '20200321'),
('Bison', '3.6.4'),
@@ -37,6 +29,14 @@ builddependencies = [
('pkg-config', '0.29.2'),
('intltool', '0.51.0', '-Perl-5.32.0'),
]
+dependencies = [
+ ('bzip2', '1.0.8'),
+ ('fontconfig', '2.13.92'),
+ ('freetype', '2.10.1'),
+ ('zlib', '1.2.11'),
+ ('xorg-macros', '1.19.2'),
+ ('libpciaccess', '0.16'),
+]
default_easyblock = 'ConfigureMake'
@@ -45,11 +45,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'],
}),
@@ -164,9 +159,6 @@ components = [
('libdmx', '1.1.4', { # 2018-05-14
'checksums': ['4d05bd5b248c1f46729fa1536b7a5e4d692567327ad41564c36742fb327af925'],
}),
- ('libpciaccess', '0.16', { # 2020-07-27
- 'checksums': ['84413553994aef0070cf420050aa5c0a51b1956b404920e21b81e96db6a61a27'],
- }),
('libxkbfile', '1.1.0', { # 2019-03-16
'checksums': ['2a92adda3992aa7cbad758ef0b8dfeaedebb49338b772c64ddf369d78c1c51d3'],
}),
diff --git a/Golden_Repo/x/xorg-macros/xorg-macros-1.19.2-GCCcore-9.3.0.eb b/Golden_Repo/x/xorg-macros/xorg-macros-1.19.2-GCCcore-9.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5117c93c5eb9089849bd06d3a23fc6a2e9f2ad0e
--- /dev/null
+++ b/Golden_Repo/x/xorg-macros/xorg-macros-1.19.2-GCCcore-9.3.0.eb
@@ -0,0 +1,39 @@
+##
+# This is a contribution from DeepThought HPC Service, Flinders University, Adelaide, Australia
+# Homepage: https://staff.flinders.edu.au/research/deep-thought
+#
+# Authors:: Robert Qiao <rob.qiao@flinders.edu.au>
+# License:: Custom
+#
+# Notes::
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'xorg-macros'
+version = '1.19.2'
+
+homepage = 'https://cgit.freedesktop.org/xorg/util/macros'
+description = """X.org macros utilities."""
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
+
+source_urls = ['https://gitlab.freedesktop.org/xorg/util/macros/-/archive/util-macros-%(version)s']
+sources = ['macros-util-macros-%(version)s.tar.gz']
+checksums = ['326e51a5d673e3d9cc7f139aee469a11e18ea060b1d06c22694612e68a2089b1']
+
+builddependencies = [
+ ('binutils', '2.34'),
+ ('Autotools', '20200321'),
+]
+
+preconfigopts = './autogen.sh && '
+
+sanity_check_paths = {
+ 'files': ['share/pkgconfig/xorg-macros.pc'],
+ 'dirs': [],
+}
+
+moduleclass = 'devel'