Index: branches/2020Q4/sysutils/slurm-wlm/Makefile =================================================================== --- branches/2020Q4/sysutils/slurm-wlm/Makefile (revision 557372) +++ branches/2020Q4/sysutils/slurm-wlm/Makefile (revision 557373) @@ -1,136 +1,136 @@ # $FreeBSD$ PORTNAME= slurm DISTVERSION= 20.02.1 -PORTREVISION= 2 +PORTREVISION= 4 CATEGORIES= sysutils python MASTER_SITES= https://download.schedmd.com/slurm/ PKGNAMESUFFIX= -wlm MAINTAINER= jwb@FreeBSD.org COMMENT= Simple Linux Utility for Resource Management LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING NOT_FOR_ARCHS= armv6 armv7 i386 mips powerpc powerpcspe NOT_FOR_ARCHS_REASON= 32-bit support is deprecated LIB_DEPENDS= libjson-c.so:devel/json-c \ libsysinfo.so:devel/libsysinfo \ libmunge.so:security/munge \ liblz4.so:archivers/liblz4 USES= compiler:c11 gmake gnome libtool lua pkgconfig python:build \ readline:port shebangfix ssl tar:bz2 USE_LDCONFIG= yes USE_PERL5= configure USE_RC_SUBR= slurmctld slurmd USERS= slurm GROUPS= ${USERS} GNU_CONFIGURE= yes INSTALL_TARGET= install-strip PLIST_SUB= PORTVERSION="${PORTVERSION}" SHEBANG_FILES= doc/html/shtml2html.py doc/man/man2html.py OPTIONS_DEFINE= CURL DOCS GUI HDF5 HWLOC IPMI MYSQL RRD OPTIONS_DEFAULT= HDF5 HWLOC OPTIONS_SUB= yes CURL_DESC= Require cURL for elasticsearch plugins GUI_DESC= Build sview GUI config tool HDF5_DESC= Job profiling using HDF5 HWLOC_DESC= Portable hardware locality IPMI_DESC= IPMI energy consumption accounting RRD_DESC= RRD external sensor data collection DOCS_BUILD_DEPENDS= man2html:textproc/man2html CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_WITH= libcurl GUI_USE= GNOME=cairo,gdkpixbuf2,glib20,gtk20 GUI_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 GUI_USES= gettext GUI_CONFIGURE_ENABLE= glibtest gtktest x11 # Neither of these work. See post-patch below. #GTK2_CONFIGURE_ENV_OFF= ac_gtk_test=no #GTK2_CONFIGURE_OFF= --disable-gtktest HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 \ libsz.so:science/szip HDF5_CONFIGURE_WITH= hdf5 HWLOC_LIB_DEPENDS= libhwloc.so:devel/hwloc HWLOC_CONFIGURE_WITH= hwloc IPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi IPMI_CONFIGURE_WITH= freeipmi MYSQL_USES= mysql MYSQL_CONFIGURE_OFF= --with-mysql_config=/nonexistent RRD_LIB_DEPENDS= librrd.so:databases/rrdtool RRD_CONFIGURE_WITH= rrdtool # --docdir is non-functional # CONFIGURE_ARGS= --docdir=${DOCSDIR} # FreeBSD Infiniband support is still experimental 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: @${REINPLACE_CMD} -e 's|min_gtk_version=.*|min_gtk_version=2000.0.0|' \ ${WRKSRC}/configure # SLURM's configure enables interactive jobs if pty.h exists. Replacing # #include with appropriate headers will therefore not work, so instead # add a pty.h for the build. pre-configure: @${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm @${REINPLACE_CMD} -e 's|sched_setaffinity|cpuset_setaffinity|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|"/proc|"/compat/linux/proc|g' \ -e 's|(/proc)|(/compat/linux/proc)|g' \ ${WRKSRC}/src/slurmd/slurmstepd/req.c \ ${WRKSRC}/src/slurmd/slurmstepd/pdebug.c \ ${WRKSRC}/src/slurmd/common/xcpuinfo.c \ ${WRKSRC}/src/slurmd/common/xcgroup.c \ ${WRKSRC}/src/slurmd/common/set_oomadj.c \ ${WRKSRC}/src/slurmd/common/proctrack.c \ ${WRKSRC}/src/common/callerid.c \ ${WRKSRC}/src/plugins/task/affinity/affinity.c \ ${WRKSRC}/src/plugins/acct_gather_energy/rapl/acct_gather_energy_rapl.c \ ${WRKSRC}/src/plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.c \ ${WRKSRC}/src/plugins/jobacct_gather/common/common_jag.c \ ${WRKSRC}/src/plugins/jobacct_gather/linux/jobacct_gather_linux.c \ ${WRKSRC}/src/plugins/switch/cray_aries/scaling.c \ ${WRKSRC}/src/plugins/proctrack/cray_aries/proctrack_cray_aries.c \ ${WRKSRC}/src/plugins/proctrack/cgroup/proctrack_cgroup.c \ ${WRKSRC}/src/plugins/proctrack/pgid/proctrack_pgid.c \ ${WRKSRC}/src/plugins/proctrack/linuxproc/kill_tree.c \ ${WRKSRC}/src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c \ ${WRKSRC}/src/plugins/node_features/knl_generic/node_features_knl_generic.c \ ${WRKSRC}/contribs/cray/pam_job.c @if ${WHICH} sbatch > /dev/null; then \ ${ECHO_CMD} "********************************************"; \ ${ECHO_CMD} "Build may fail while slurm-wlm is installed."; \ ${ECHO_CMD} "Deinstall slurm-wlm and run make again."; \ ${ECHO_CMD} "********************************************"; \ false; \ fi post-install: ${INSTALL_DATA} ${WRKSRC}/etc/slurm.conf.example \ ${STAGEDIR}${PREFIX}/etc/slurm.conf.sample .include Index: branches/2020Q4/sysutils/slurm-wlm/files/patch-c8be6ceb.c =================================================================== --- branches/2020Q4/sysutils/slurm-wlm/files/patch-c8be6ceb.c (revision 557372) +++ branches/2020Q4/sysutils/slurm-wlm/files/patch-c8be6ceb.c (nonexistent) @@ -1,25 +0,0 @@ -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: branches/2020Q4/sysutils/slurm-wlm/files/patch-c8be6ceb.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2020Q4/sysutils/slurm-wlm/files/patch-src_plugins_select_cons__tres_job__test.c =================================================================== --- branches/2020Q4/sysutils/slurm-wlm/files/patch-src_plugins_select_cons__tres_job__test.c (revision 557372) +++ branches/2020Q4/sysutils/slurm-wlm/files/patch-src_plugins_select_cons__tres_job__test.c (nonexistent) @@ -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 */ Property changes on: branches/2020Q4/sysutils/slurm-wlm/files/patch-src_plugins_select_cons__tres_job__test.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2020Q4/sysutils/slurm-wlm/files/patch-configure =================================================================== --- branches/2020Q4/sysutils/slurm-wlm/files/patch-configure (nonexistent) +++ branches/2020Q4/sysutils/slurm-wlm/files/patch-configure (revision 557373) @@ -0,0 +1,38 @@ +--- configure.orig 2020-11-30 15:56:36 UTC ++++ configure +@@ -24075,8 +24075,24 @@ fi + + + x_ac_lua_pkg_name="lua" +- #check for 5.3 then 5.2 then 5.1 +- if test -n "$PKG_CONFIG" && \ ++ #check for 5.4 then 5.3 then 5.2 then 5.1 ++if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.4\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "lua5.4") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ x_ac_lua_pkg_name=lua5.4 ++else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.4\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "lua-5.4") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ x_ac_lua_pkg_name=lua-5.4 ++else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3\""; } >&5 + ($PKG_CONFIG --exists --print-errors "lua5.3") 2>&5 + ac_status=$? +@@ -24125,6 +24141,8 @@ else + x_ac_lua_pkg_name=lua-5.1 + else + x_ac_lua_pkg_name="lua >= 5.1" ++fi ++fi + fi + fi + fi Property changes on: branches/2020Q4/sysutils/slurm-wlm/files/patch-configure ___________________________________________________________________ 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: branches/2020Q4 =================================================================== --- branches/2020Q4 (revision 557372) +++ branches/2020Q4 (revision 557373) Property changes on: branches/2020Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r556796,557295