Merge pull request #20795 from boegel/20240610194037_new_pr_pdsh234

add patch to fix build of pdsh 2.34 with Slurm 23.x
easybuilders · Jun 10, 2024 · 389f1f9 · 389f1f9
2 parents 4914367 + 2c3eceb
commit 389f1f9
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 3 deletions.
diff --git a/easybuild/easyconfigs/p/pdsh/pdsh-2.34-GCCcore-11.3.0.eb b/easybuild/easyconfigs/p/pdsh/pdsh-2.34-GCCcore-11.3.0.eb
@@ -10,7 +10,11 @@ toolchain = {'name': 'GCCcore', 'version': '11.3.0'}
 
 source_urls = ['https://github.com/chaos/pdsh/releases/download/pdsh-%(version)s/']
 sources = [SOURCE_TAR_GZ]
-checksums = ['b47b3e4662736ef44b6fe86e3d380f95e591863e69163aa0592e9f9f618521e9']
+patches = ['pdsh-2.34_fix-slurm-23.x.patch']
+checksums = [
+    {'pdsh-2.34.tar.gz': 'b47b3e4662736ef44b6fe86e3d380f95e591863e69163aa0592e9f9f618521e9'},
+    {'pdsh-2.34_fix-slurm-23.x.patch': 'cba3a60f5cbc2ca6dc32cda16998c43818f740c0998aba201dfbe334349e60b9'},
+]
 
 builddependencies = [
     ('binutils', '2.38'),

diff --git a/easybuild/easyconfigs/p/pdsh/pdsh-2.34-GCCcore-12.2.0.eb b/easybuild/easyconfigs/p/pdsh/pdsh-2.34-GCCcore-12.2.0.eb
@@ -10,7 +10,11 @@ toolchain = {'name': 'GCCcore', 'version': '12.2.0'}
 
 source_urls = ['https://github.com/chaos/pdsh/releases/download/pdsh-%(version)s/']
 sources = [SOURCE_TAR_GZ]
-checksums = ['b47b3e4662736ef44b6fe86e3d380f95e591863e69163aa0592e9f9f618521e9']
+patches = ['pdsh-2.34_fix-slurm-23.x.patch']
+checksums = [
+    {'pdsh-2.34.tar.gz': 'b47b3e4662736ef44b6fe86e3d380f95e591863e69163aa0592e9f9f618521e9'},
+    {'pdsh-2.34_fix-slurm-23.x.patch': 'cba3a60f5cbc2ca6dc32cda16998c43818f740c0998aba201dfbe334349e60b9'},
+]
 
 builddependencies = [
     ('binutils', '2.39'),

diff --git a/easybuild/easyconfigs/p/pdsh/pdsh-2.34-GCCcore-12.3.0.eb b/easybuild/easyconfigs/p/pdsh/pdsh-2.34-GCCcore-12.3.0.eb
@@ -10,7 +10,11 @@ toolchain = {'name': 'GCCcore', 'version': '12.3.0'}
 
 source_urls = ['https://github.com/chaos/pdsh/releases/download/pdsh-%(version)s/']
 sources = [SOURCE_TAR_GZ]
-checksums = ['b47b3e4662736ef44b6fe86e3d380f95e591863e69163aa0592e9f9f618521e9']
+patches = ['pdsh-2.34_fix-slurm-23.x.patch']
+checksums = [
+    {'pdsh-2.34.tar.gz': 'b47b3e4662736ef44b6fe86e3d380f95e591863e69163aa0592e9f9f618521e9'},
+    {'pdsh-2.34_fix-slurm-23.x.patch': 'cba3a60f5cbc2ca6dc32cda16998c43818f740c0998aba201dfbe334349e60b9'},
+]
 
 builddependencies = [
     ('binutils', '2.40'),

diff --git a/easybuild/easyconfigs/p/pdsh/pdsh-2.34_fix-slurm-23.x.patch b/easybuild/easyconfigs/p/pdsh/pdsh-2.34_fix-slurm-23.x.patch
@@ -0,0 +1,22 @@
+see https://github.com/chaos/pdsh/issues/152 + https://github.com/chaos/pdsh/pull/153
+diff --git a/src/modules/slurm.c b/src/modules/slurm.c
+index 5594c4f..c227337 100644
+--- a/src/modules/slurm.c
++++ b/src/modules/slurm.c
+@@ -50,6 +50,16 @@
+  *  with our internal List datatype.
+  */
+ #define __list_datatypes_defined 1
++/*
++ * Also, Slurm>=23.x requires that `struct xlist` be typedef'd to list_t:
++ */
++typedef struct xlist list_t;
++typedef struct listIterator list_itr_t;
++/*
++ * Also, Slurm exports the hostlist_t interface as well:
++ */
++#define __hostlist_t_defined 1
++
+ #include <slurm/slurm.h>
+ #include <slurm/slurm_errno.h>
+