From b4942ee99c2295cd240a63b69303d9610a71a0ea Mon Sep 17 00:00:00 2001
From: Damian Alvarez <alvarezmallon1@jwlogin02.juwels>
Date: Wed, 10 Nov 2021 10:54:06 +0100
Subject: [PATCH] To use an autoconf that works with the files used for psmpi

---
 .../Autoconf/Autoconf-2.69-GCCcore-11.2.0.eb  | 41 +++++++++++++++++++
 .../p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb       |  2 +
 ...mpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb |  2 +
 .../psmpi-5.5.0-1-intel-compilers-2021.4.0.eb |  2 +
 .../p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb       |  2 +
 ...mpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb |  2 +
 .../psmpi-5.5.0-1-intel-compilers-2021.4.0.eb |  2 +
 7 files changed, 53 insertions(+)
 create mode 100644 Golden_Repo/a/Autoconf/Autoconf-2.69-GCCcore-11.2.0.eb

diff --git a/Golden_Repo/a/Autoconf/Autoconf-2.69-GCCcore-11.2.0.eb b/Golden_Repo/a/Autoconf/Autoconf-2.69-GCCcore-11.2.0.eb
new file mode 100644
index 000000000..fc039083f
--- /dev/null
+++ b/Golden_Repo/a/Autoconf/Autoconf-2.69-GCCcore-11.2.0.eb
@@ -0,0 +1,41 @@
+easyblock = 'ConfigureMake'
+
+name = 'Autoconf'
+version = '2.69'
+
+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.
+"""
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+checksums = ['954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969']
+
+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/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
index 4b6ccca74..390d9aab9 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
@@ -15,6 +15,8 @@ source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 builddependencies = [
     # needed for autogen.sh on CentOS 7
     ('Autotools', '20210726'),
+    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
+    ('Autoconf', '2.69'),
 ]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
diff --git a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
index 683a9a89b..4a3abaf2e 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
@@ -16,6 +16,8 @@ source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 builddependencies = [
     # needed for autogen.sh on CentOS 7
     ('Autotools', '20210726'),
+    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
+    ('Autoconf', '2.69'),
 ]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
diff --git a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
index a145e5dd2..bc8608337 100644
--- a/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
+++ b/Golden_Repo/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
@@ -15,6 +15,8 @@ source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 builddependencies = [
     # needed for autogen.sh on CentOS 7
     ('Autotools', '20210726'),
+    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
+    ('Autoconf', '2.69'),
 ]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
index 2b2660b3c..b95740c01 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
@@ -15,6 +15,8 @@ source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 builddependencies = [
     # needed for autogen.sh on CentOS 7
     ('Autotools', '20210726'),
+    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
+    ('Autoconf', '2.69'),
 ]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
index 0ac13af09..94e9fbce9 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
@@ -16,6 +16,8 @@ source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 builddependencies = [
     # needed for autogen.sh on CentOS 7
     ('Autotools', '20210726'),
+    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
+    ('Autoconf', '2.69'),
 ]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
diff --git a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
index b7239e6a3..b9f72e6bd 100644
--- a/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
+++ b/Overlays/hdfml_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
@@ -15,6 +15,8 @@ source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 builddependencies = [
     # needed for autogen.sh on CentOS 7
     ('Autotools', '20210726'),
+    # Autoconf >2.69 is generating a buggy configure script, so take it down to the one that works
+    ('Autoconf', '2.69'),
 ]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
-- 
GitLab