diff options
| -rw-r--r-- | sysutils/slurm-wlm/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/slurm-wlm/files/patch-src_plugins_task_affinity_affinity.c | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile index 517b38320bd3..f3dd6e9c9b11 100644 --- a/sysutils/slurm-wlm/Makefile +++ b/sysutils/slurm-wlm/Makefile @@ -77,7 +77,8 @@ RRD_CONFIGURE_WITH= rrdtool # --docdir is non-functional # CONFIGURE_ARGS= --docdir=${DOCSDIR} # FreeBSD Infiniband support is still experimental -CONFIGURE_ARGS= --without-ofed +# slurmrestd does not build on FreeBSD +CONFIGURE_ARGS= --without-ofed --disable-slurmrestd DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION} CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include -fcommon diff --git a/sysutils/slurm-wlm/files/patch-src_plugins_task_affinity_affinity.c b/sysutils/slurm-wlm/files/patch-src_plugins_task_affinity_affinity.c new file mode 100644 index 000000000000..cf09d539002c --- /dev/null +++ b/sysutils/slurm-wlm/files/patch-src_plugins_task_affinity_affinity.c @@ -0,0 +1,11 @@ +--- src/plugins/task/affinity/affinity.c.orig 2021-05-12 20:23:20 UTC ++++ src/plugins/task/affinity/affinity.c +@@ -297,7 +297,7 @@ void reset_cpuset(cpu_set_t *new_mask, cpu_set_t *cur_ + if (slurm_getaffinity(1, sizeof(full_mask), &full_mask)) { + /* Try to get full CPU mask from process init */ + CPU_ZERO(&full_mask); +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) && !defined(CPU_ALLOC) + CPU_OR(&full_mask, cur_mask); + #else + CPU_OR(&full_mask, &full_mask, cur_mask); |