sysutils/slurm-wlm: Back out -fno-common patches, add -fcommon flag

Fixes runtime regression caused by r546150

Reported by:    jrm
MFH:            2020Q4
This commit is contained in:
Jason W. Bacon 2020-12-08 16:21:16 +00:00
parent a2758f114a
commit 23137bb0cc
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=557295
4 changed files with 3 additions and 50 deletions

View File

@ -2,7 +2,7 @@
PORTNAME= slurm
DISTVERSION= 20.02.1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= sysutils python
MASTER_SITES= https://download.schedmd.com/slurm/
PKGNAMESUFFIX= -wlm
@ -82,8 +82,8 @@ RRD_CONFIGURE_WITH= rrdtool
CONFIGURE_ARGS= --without-ofed
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lprocstat
CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include -fcommon
LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lprocstat -fcommon
# Hack around nonfunctional --disable-gtktest flag
pre-configure-GUI-off:

View File

@ -1,26 +0,0 @@
--- 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 */

View File

@ -1,10 +0,0 @@
--- src/scancel/scancel.c.orig 2020-03-26 21:44:05 UTC
+++ 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)

View File

@ -1,11 +0,0 @@
--- src/scancel/scancel.h.orig 2020-03-26 21:44:05 UTC
+++ 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