From fd1ec01648be5aca2180c57a9503431ecb922983 Mon Sep 17 00:00:00 2001 From: Sebastian Achilles <s.achilles@fz-juelich.de> Date: Tue, 21 Sep 2021 11:01:25 +0200 Subject: [PATCH] Remove Autoconf, Automake and Autotools from GCCcore toolchain --- .../Autoconf/Autoconf-2.71-GCCcore-11.2.0.eb | 43 ------------------- .../Automake-1.16.4-GCCcore-11.2.0.eb | 34 --------------- .../Autotools-20210726-GCCcore-11.2.0.eb | 26 ----------- .../libpciaccess-0.16-GCCcore-11.2.0.eb | 2 +- Golden_Repo/n/numactl/numactl-2.0.14.eb | 2 +- .../o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb | 2 +- .../xorg-macros-1.19.3-GCCcore-11.2.0.eb | 6 ++- 7 files changed, 7 insertions(+), 108 deletions(-) delete mode 100644 Golden_Repo/a/Autoconf/Autoconf-2.71-GCCcore-11.2.0.eb delete mode 100644 Golden_Repo/a/Automake/Automake-1.16.4-GCCcore-11.2.0.eb delete mode 100644 Golden_Repo/a/Autotools/Autotools-20210726-GCCcore-11.2.0.eb diff --git a/Golden_Repo/a/Autoconf/Autoconf-2.71-GCCcore-11.2.0.eb b/Golden_Repo/a/Autoconf/Autoconf-2.71-GCCcore-11.2.0.eb deleted file mode 100644 index 680bfb39e..000000000 --- a/Golden_Repo/a/Autoconf/Autoconf-2.71-GCCcore-11.2.0.eb +++ /dev/null @@ -1,43 +0,0 @@ -easyblock = 'ConfigureMake' - -name = 'Autoconf' -version = '2.71' - -homepage = 'https://www.gnu.org/software/autoconf/' - -description = """ - Autoconf is an extensible package of M4 macros that produce shell scripts - to automatically configure software source code packages. These scripts can - adapt the packages to many kinds of UNIX-like systems without manual user - intervention. Autoconf creates a configuration script for a package from a - template file that lists the operating system features that the package can - use, in the form of M4 macro calls. -""" - -site_contacts = 'sc@fz-juelich.de' - -toolchain = {'name': 'GCCcore', 'version': '11.2.0'} - -source_urls = [GNU_SOURCE] -sources = [SOURCELOWER_TAR_GZ] -checksums = ['431075ad0bf529ef13cb41e9042c542381103e80015686222b8a9d4abef42a1c'] - -builddependencies = [ - ('binutils', '2.37'), - # non-standard Perl modules are required, - # see https://github.com/easybuilders/easybuild-easyconfigs/issues/1822 - ('Perl', '5.34.0'), -] - -dependencies = [ - ('M4', '1.4.19'), -] - -sanity_check_paths = { - 'files': ["bin/%s" % x - for x in ["autoconf", "autoheader", "autom4te", "autoreconf", - "autoscan", "autoupdate", "ifnames"]], - 'dirs': [], -} - -moduleclass = 'devel' diff --git a/Golden_Repo/a/Automake/Automake-1.16.4-GCCcore-11.2.0.eb b/Golden_Repo/a/Automake/Automake-1.16.4-GCCcore-11.2.0.eb deleted file mode 100644 index 230fe2983..000000000 --- a/Golden_Repo/a/Automake/Automake-1.16.4-GCCcore-11.2.0.eb +++ /dev/null @@ -1,34 +0,0 @@ -easyblock = 'ConfigureMake' - -name = 'Automake' -version = '1.16.4' - -homepage = 'https://www.gnu.org/software/automake/automake.html' - -description = "Automake: GNU Standards-compliant Makefile generator" - -site_contacts = 'sc@fz-juelich.de' - -toolchain = {'name': 'GCCcore', 'version': '11.2.0'} - -source_urls = [GNU_SOURCE] -sources = [SOURCELOWER_TAR_GZ] -checksums = ['8a0f0be7aaae2efa3a68482af28e5872d8830b9813a6a932a2571eac63ca1794'] - -builddependencies = [ - ('binutils', '2.37'), - # non-standard Perl modules are required, - # see https://github.com/easybuilders/easybuild-easyconfigs/issues/1822 - ('Perl', '5.34.0'), -] - -dependencies = [ - ('Autoconf', '2.71'), -] - -sanity_check_paths = { - 'files': ['bin/automake', 'bin/aclocal'], - 'dirs': [] -} - -moduleclass = 'devel' diff --git a/Golden_Repo/a/Autotools/Autotools-20210726-GCCcore-11.2.0.eb b/Golden_Repo/a/Autotools/Autotools-20210726-GCCcore-11.2.0.eb deleted file mode 100644 index 9b278afdc..000000000 --- a/Golden_Repo/a/Autotools/Autotools-20210726-GCCcore-11.2.0.eb +++ /dev/null @@ -1,26 +0,0 @@ -easyblock = 'Bundle' - -name = 'Autotools' -version = '20210726' # date of the most recent change - -homepage = 'https://autotools.io' - -description = """ - This bundle collect the standard GNU build tools: Autoconf, Automake - and libtool -""" - -site_contacts = 'a.strube@fz-juelich.de' - -toolchain = {'name': 'GCCcore', 'version': '11.2.0'} - -dependencies = [ - ('Autoconf', '2.71'), # 20210128 - ('Automake', '1.16.4'), # 20210726 - ('libtool', '2.4.6'), # 20150215 -] - -# Pure bundle -- no need to specify 'binutils' used when building GCCcore -# toolchain as build dependency - -moduleclass = 'devel' diff --git a/Golden_Repo/l/libpciaccess/libpciaccess-0.16-GCCcore-11.2.0.eb b/Golden_Repo/l/libpciaccess/libpciaccess-0.16-GCCcore-11.2.0.eb index 56d0c9048..1bc4c4a5a 100644 --- a/Golden_Repo/l/libpciaccess/libpciaccess-0.16-GCCcore-11.2.0.eb +++ b/Golden_Repo/l/libpciaccess/libpciaccess-0.16-GCCcore-11.2.0.eb @@ -14,7 +14,7 @@ checksums = ['84413553994aef0070cf420050aa5c0a51b1956b404920e21b81e96db6a61a27'] builddependencies = [ ('binutils', '2.37'), - ('Autotools', '20210726'), + ('Autotools', '20210726', '', SYSTEM), ('xorg-macros', '1.19.3'), ] diff --git a/Golden_Repo/n/numactl/numactl-2.0.14.eb b/Golden_Repo/n/numactl/numactl-2.0.14.eb index 9c8c95a57..dc52fd4e5 100644 --- a/Golden_Repo/n/numactl/numactl-2.0.14.eb +++ b/Golden_Repo/n/numactl/numactl-2.0.14.eb @@ -23,7 +23,7 @@ checksums = ['1ee27abd07ff6ba140aaf9bc6379b37825e54496e01d6f7343330cf1a4487035'] builddependencies = [ ('binutils', '2.37'), - ('Autotools', '20210726'), + ('Autotools', '20210726', '', SYSTEM), ] preconfigopts = './autogen.sh && ' diff --git a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb index 9822e711d..b0ae5d684 100644 --- a/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb +++ b/Golden_Repo/o/OpenMPI/OpenMPI-4.1.1-GCC-11.2.0.eb @@ -24,7 +24,7 @@ osdependencies = [ ] builddependencies = [ - ('Autotools', '20210726'), + ('Autotools', '20210726', '', SYSTEM), ('pkg-config', '0.29.2'), ] diff --git a/Golden_Repo/x/xorg-macros/xorg-macros-1.19.3-GCCcore-11.2.0.eb b/Golden_Repo/x/xorg-macros/xorg-macros-1.19.3-GCCcore-11.2.0.eb index 7aef6f454..bce3cc7a2 100644 --- a/Golden_Repo/x/xorg-macros/xorg-macros-1.19.3-GCCcore-11.2.0.eb +++ b/Golden_Repo/x/xorg-macros/xorg-macros-1.19.3-GCCcore-11.2.0.eb @@ -10,13 +10,15 @@ site_contacts = 'sc@fz-juelich.de' toolchain = {'name': 'GCCcore', 'version': '11.2.0'} -source_urls = ['https://gitlab.freedesktop.org/xorg/util/macros/-/archive/util-macros-%(version)s'] +source_urls = [ + 'https://gitlab.freedesktop.org/xorg/util/macros/-/archive/util-macros-%(version)s' +] sources = ['macros-util-macros-%(version)s.tar.gz'] checksums = ['8205d210a580da0938f5ce4392a96b60cf1d9a5f792eaa1474fa4c1977aef4d0'] builddependencies = [ ('binutils', '2.37'), - ('Autotools', '20210726'), + ('Autotools', '20210726', '', SYSTEM), ] preconfigopts = './autogen.sh && ' -- GitLab