From 969818c4c0358583ff9db2c822f11dc8396bb8b1 Mon Sep 17 00:00:00 2001
From: Damian Alvarez <swmanage@jwlogin06.juwels>
Date: Tue, 9 Nov 2021 16:45:38 +0100
Subject: [PATCH] To fix a build issue in CentOS 7 systems, and to fix the
 patch

---
 .../p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb        |  4 ++++
 ...smpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb |  4 ++++
 .../psmpi-5.5.0-1-intel-compilers-2021.4.0.eb  |  4 ++++
 Golden_Repo/p/psmpi/psmpi_shebang.patch        | 18 +++++++++---------
 .../p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb        |  4 ++++
 ...smpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb |  4 ++++
 .../psmpi-5.5.0-1-intel-compilers-2021.4.0.eb  |  4 ++++
 .../p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb        |  6 +++++-
 ...smpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb |  6 +++++-
 .../psmpi-5.5.0-1-intel-compilers-2021.4.0.eb  |  6 +++++-
 10 files changed, 48 insertions(+), 12 deletions(-)

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 e7896586d..4b6ccca74 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
@@ -12,6 +12,10 @@ toolchain = {'name': 'GCC', 'version': '11.2.0'}
 sources = [SOURCE_TAR_BZ2]
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 
+builddependencies = [
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
     # needed due to the inclusion of hwloc
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 9e34ca629..683a9a89b 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
@@ -13,6 +13,10 @@ toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
 sources = [SOURCE_TAR_BZ2]
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 
+builddependencies = [
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
     # needed due to the inclusion of hwloc
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 dc30d1611..a145e5dd2 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
@@ -12,6 +12,10 @@ toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
 sources = [SOURCE_TAR_BZ2]
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 
+builddependencies = [
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
     # needed due to the inclusion of hwloc
diff --git a/Golden_Repo/p/psmpi/psmpi_shebang.patch b/Golden_Repo/p/psmpi/psmpi_shebang.patch
index 0ee53ac26..3fa1addb4 100644
--- a/Golden_Repo/p/psmpi/psmpi_shebang.patch
+++ b/Golden_Repo/p/psmpi/psmpi_shebang.patch
@@ -13,24 +13,24 @@ diff -ruN psmpi-5.2.0-1.old/mpich2/src/env/mpicxx.bash.in psmpi-5.2.0-1/mpich2/s
 @@ -1,4 +1,4 @@
 -#! @BASH_SHELL@
 +#!/usr/bin/env bash
- # 
- # (C) 2006 by Argonne National Laboratory.
- #     See COPYRIGHT in top-level directory.
+ ##
+ ## (C) 2006 by Argonne National Laboratory.
+ ##     See COPYRIGHT in top-level directory.
 diff -ruN psmpi-5.2.0-1.old/mpich2/src/env/mpif77.bash.in psmpi-5.2.0-1/mpich2/src/env/mpif77.bash.in
 --- psmpi-5.2.0-1.old/mpich2/src/env/mpif77.bash.in	2017-03-08 20:47:13.160276506 +0100
 +++ psmpi-5.2.0-1/mpich2/src/env/mpif77.bash.in	2017-03-08 20:47:55.148288103 +0100
 @@ -1,4 +1,4 @@
 -#! @BASH_SHELL@
 +#!/usr/bin/env bash
- #
- # (C) 2006 by Argonne National Laboratory.
- #     See COPYRIGHT in top-level directory.
+ ##
+ ## (C) 2006 by Argonne National Laboratory.
+ ##     See COPYRIGHT in top-level directory.
 diff -ruN psmpi-5.2.0-1.old/mpich2/src/env/mpifort.bash.in psmpi-5.2.0-1/mpich2/src/env/mpifort.bash.in
 --- psmpi-5.2.0-1.old/mpich2/src/env/mpifort.bash.in	2017-03-08 20:47:13.160276506 +0100
 +++ psmpi-5.2.0-1/mpich2/src/env/mpifort.bash.in	2017-03-08 20:48:08.913947609 +0100
 @@ -1,4 +1,4 @@
 -#! @BASH_SHELL@
 +#!/usr/bin/env bash
- #
- # (C) 2006 by Argonne National Laboratory.
- #     See COPYRIGHT in top-level directory.
+ ##
+ ## (C) 2006 by Argonne National Laboratory.
+ ##     See COPYRIGHT in top-level directory.
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 b6c50f4e6..2b2660b3c 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
@@ -12,6 +12,10 @@ toolchain = {'name': 'GCC', 'version': '11.2.0'}
 sources = [SOURCE_TAR_BZ2]
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 
+builddependencies = [
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
     # needed due to the inclusion of hwloc
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 32fab4fcd..0ac13af09 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
@@ -13,6 +13,10 @@ toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
 sources = [SOURCE_TAR_BZ2]
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 
+builddependencies = [
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
     # needed due to the inclusion of hwloc
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 04f0bcf82..b7239e6a3 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
@@ -12,6 +12,10 @@ toolchain = {'name': 'intel-compilers', 'version': '2021.4.0'}
 sources = [SOURCE_TAR_BZ2]
 source_urls = ['https://github.com/ParaStation/psmpi/archive/']
 
+builddependencies = [
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+]
 dependencies = [
     ('pscom', '5.4-default', '', SYSTEM),
     # needed due to the inclusion of hwloc
diff --git a/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb b/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
index 1afe2ae1b..0848cb67e 100644
--- a/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
+++ b/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb
@@ -23,7 +23,11 @@ patches = [
     'psmpi_shebang.patch',
 ]
 
-builddependencies = [('popt', '1.18', '', SYSTEM)]
+builddependencies = [
+    ('popt', '1.18', '', SYSTEM),
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+]
 
 dependencies = [
     # needed due to the inclusion of hwloc
diff --git a/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb b/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
index ee7bc0330..a52cdaed3 100644
--- a/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
+++ b/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb
@@ -24,7 +24,11 @@ patches = [
     'psmpi_shebang.patch',
 ]
 
-builddependencies = [('popt', '1.18', '', SYSTEM)]
+builddependencies = [
+    ('popt', '1.18', '', SYSTEM),
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+]
 
 dependencies = [
     # needed due to the inclusion of hwloc
diff --git a/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb b/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
index 1fc3c05b8..0181104d8 100644
--- a/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
+++ b/Overlays/jurecabooster_overlay/p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb
@@ -23,7 +23,11 @@ patches = [
     'psmpi_shebang.patch',
 ]
 
-builddependencies = [('popt', '1.18', '', SYSTEM)]
+builddependencies = [
+    ('popt', '1.18', '', SYSTEM),
+    # needed for autogen.sh on CentOS 7
+    ('Autotools', '20210726'),
+]
 
 dependencies = [
     # needed due to the inclusion of hwloc
-- 
GitLab