Index: head/sysutils/slurm-wlm/files/patch-c8be6ceb.c =================================================================== --- head/sysutils/slurm-wlm/files/patch-c8be6ceb.c (nonexistent) +++ head/sysutils/slurm-wlm/files/patch-c8be6ceb.c (revision 546150) @@ -0,0 +1,25 @@ +diff --git a/src/scancel/scancel.c b/src/scancel/scancel.c +index 4448b75599..23594fe0bf 100644 +--- src/scancel/scancel.c ++++ src/scancel/scancel.c +@@ -99,6 +99,7 @@ static pthread_cond_t num_active_threads_cond; + static pthread_mutex_t max_delay_lock; + static uint32_t max_resp_time = 0; + static int request_count = 0; ++opt_t opt; + + int + main (int argc, char **argv) +diff --git a/src/scancel/scancel.h b/src/scancel/scancel.h +index a0c9d8a829..678bcd7616 100644 +--- src/scancel/scancel.h ++++ src/scancel/scancel.h +@@ -75,7 +75,7 @@ typedef struct scancel_options { + bool *job_pend; /* Set fi job is pending */ + } opt_t; + +-opt_t opt; ++extern opt_t opt; + + /* process options: + * 1. set defaults Property changes on: head/sysutils/slurm-wlm/files/patch-c8be6ceb.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/slurm-wlm/files/patch-src_plugins_select_cons__tres_job__test.c =================================================================== --- head/sysutils/slurm-wlm/files/patch-src_plugins_select_cons__tres_job__test.c (nonexistent) +++ head/sysutils/slurm-wlm/files/patch-src_plugins_select_cons__tres_job__test.c (revision 546150) @@ -0,0 +1,26 @@ +--- src/plugins/select/cons_tres/job_test.c.orig 2020-03-26 21:44:05 UTC ++++ src/plugins/select/cons_tres/job_test.c +@@ -41,23 +41,6 @@ + + #define _DEBUG 0 /* Enables module specific debugging */ + +-/* +- * These symbols are defined here so when we link with something other +- * than the slurmctld we will have these symbols defined. They will get +- * overwritten when linking with the slurmctld. +- */ +-#if defined (__APPLE__) +-extern slurmctld_config_t slurmctld_config __attribute__((weak_import)); +-extern bitstr_t *idle_node_bitmap __attribute__((weak_import)); +-extern node_record_t *node_record_table_ptr __attribute__((weak_import)); +-extern List job_list __attribute__((weak_import)); +-#else +-slurmctld_config_t slurmctld_config; +-bitstr_t *idle_node_bitmap; +-node_record_t *node_record_table_ptr; +-List job_list; +-#endif +- + typedef struct node_weight_struct { + bitstr_t *node_bitmap; /* bitmap of nodes with this weight */ + uint32_t weight; /* priority of node for scheduling work on */ Property changes on: head/sysutils/slurm-wlm/files/patch-src_plugins_select_cons__tres_job__test.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property