From 8427abb2b2b2c74e131d8dd780688aeafe1ae3d3 Mon Sep 17 00:00:00 2001
From: Damian Alvarez <alvarezmallon1@jwlogin02.juwels>
Date: Wed, 10 Nov 2021 15:05:38 +0100
Subject: [PATCH] Fixes for psmpi on jurecabooster
---
.../p/psmpi/psmpi-5.5.0-1-GCC-11.2.0.eb | 8 ++++++--
.../p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0-mt.eb | 8 ++++++--
.../p/psmpi/psmpi-5.5.0-1-intel-compilers-2021.4.0.eb | 8 ++++++--
3 files changed, 18 insertions(+), 6 deletions(-)
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 0848cb67e..b7e97e5de 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
@@ -16,7 +16,7 @@ source_urls = [
]
sources = [
SOURCE_TAR_BZ2,
- 'pscom-%s.tar.bz2' % local_pscom_version
+ 'pscom-%s.tar.gz' % local_pscom_version
]
patches = [
@@ -25,8 +25,11 @@ patches = [
builddependencies = [
('popt', '1.18', '', SYSTEM),
- # 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'),
+ # autogen also needs perl
+ ('Perl', '5.34.0'),
]
dependencies = [
@@ -35,6 +38,7 @@ dependencies = [
]
mpich_opts = '--enable-static'
+preconfigopts = './autogen.sh && '
configopts = '--with-pscom-builtin=psm2'
pscom_allin_path = '%%(builddir)s/pscom-%s ' % local_pscom_version
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 a52cdaed3..06fd68331 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
@@ -17,7 +17,7 @@ source_urls = [
]
sources = [
SOURCE_TAR_BZ2,
- 'pscom-%s.tar.bz2' % local_pscom_version
+ 'pscom-%s.tar.gz' % local_pscom_version
]
patches = [
@@ -26,8 +26,11 @@ patches = [
builddependencies = [
('popt', '1.18', '', SYSTEM),
- # 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'),
+ # autogen also needs perl
+ ('Perl', '5.34.0'),
]
dependencies = [
@@ -36,6 +39,7 @@ dependencies = [
]
mpich_opts = '--enable-static'
+preconfigopts = './autogen.sh && '
configopts = '--with-pscom-builtin=psm2'
pscom_allin_path = '%%(builddir)s/pscom-%s ' % local_pscom_version
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 0181104d8..0f026a4c9 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
@@ -16,7 +16,7 @@ source_urls = [
]
sources = [
SOURCE_TAR_BZ2,
- 'pscom-%s.tar.bz2' % local_pscom_version
+ 'pscom-%s.tar.gz' % local_pscom_version
]
patches = [
@@ -25,8 +25,11 @@ patches = [
builddependencies = [
('popt', '1.18', '', SYSTEM),
- # 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'),
+ # autogen also needs perl
+ ('Perl', '5.34.0'),
]
dependencies = [
@@ -35,6 +38,7 @@ dependencies = [
]
mpich_opts = '--enable-static'
+preconfigopts = './autogen.sh && '
configopts = '--with-pscom-builtin=psm2'
pscom_allin_path = '%%(builddir)s/pscom-%s ' % local_pscom_version
--
GitLab