diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2025-11-28 15:22:47 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2025-11-28 15:24:04 +0100 |
| commit | 17c3c275fdd471d4a16b00420306680fff762f98 (patch) | |
| tree | 593dd55ac14f361940442e54e18a7bda88001591 /gnu | |
| parent | 04e9e4a4623391bb225dcc0dd3003a0d3300f16d (diff) | |
gnu: slurm-drmaa: Patch to allow building with Slurm 25.
* gnu/packages/patches/slurm-drmaa-25.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/parallel.scm (slurm-drmaa)[source]: Add patch.
Change-Id: Ieca80af78f34d3bd136a8108d1eaeae4c2b32df3
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/parallel.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/slurm-drmaa-25.patch | 29 |
3 files changed, 31 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 212b12a4beb..d57918171a4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2304,6 +2304,7 @@ dist_patch_DATA = \ %D%/packages/patches/slim-login.patch \ %D%/packages/patches/slim-display.patch \ %D%/packages/patches/slurm-23-salloc-fallback-shell.patch \ + %D%/packages/patches/slurm-drmaa-25.patch \ %D%/packages/patches/stex-copy-from-immutable-store.patch \ %D%/packages/patches/sysdig-shared-falcosecurity-libs.patch \ %D%/packages/patches/syslinux-gcc10.patch \ diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 1bdf6317e7b..1b2f556d7bc 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -422,6 +422,7 @@ minimal slurm package BASE-SLURM." (sha256 (base32 "1vydd44wp1xns7dd6zh7yin7i5p0ia3x2bk7ql56wfzhi22yf9sd")) + (patches (search-patches "slurm-drmaa-25.patch")) (modules '((guix build utils))) (snippet ;; This is a typo fixed in upstream commit diff --git a/gnu/packages/patches/slurm-drmaa-25.patch b/gnu/packages/patches/slurm-drmaa-25.patch new file mode 100644 index 00000000000..33f89cc5c57 --- /dev/null +++ b/gnu/packages/patches/slurm-drmaa-25.patch @@ -0,0 +1,29 @@ +Taken from https://patch-diff.githubusercontent.com/raw/natefoo/slurm-drmaa/pull/96.patch + +diff --git a/slurm_drmaa/job.c b/slurm_drmaa/job.c +index 362c6dc..249f396 100644 +--- a/slurm_drmaa/job.c ++++ b/slurm_drmaa/job.c +@@ -522,7 +522,22 @@ slurmdrmaa_job_on_missing( fsd_job_t *self ) + job_cond->step_list = slurm_list_create(slurmdb_destroy_selected_step); + #endif + ++#if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(24,11,0) ++ /* slurm_addto_step_list() was removed in SLURM 24.11.0+ */ ++ { ++ slurm_selected_step_t *selected_step; ++ fsd_calloc(selected_step, 1, slurm_selected_step_t); ++ selected_step->array_bitmap = NULL; ++ selected_step->array_task_id = NO_VAL; ++ selected_step->het_job_offset = NO_VAL; ++ selected_step->step_id.job_id = atoi(self->job_id); ++ selected_step->step_id.step_id = NO_VAL; ++ selected_step->step_id.step_het_comp = NO_VAL; ++ slurm_list_append(job_cond->step_list, selected_step); ++ } ++#else + slurm_addto_step_list(job_cond->step_list, self->job_id); ++#endif + job_cond->usage_end = time(NULL); + acct_db_conn = slurmdb_connection_get(NULL); + jobs = slurmdb_jobs_get(acct_db_conn, job_cond); |