cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysutils/slurm-wlm: 15.06.12 -> 16.05.4 and fix build hangs

Browse Source 
PR:		210648
Changes:	https://github.com/SchedMD/slurm/blob/master/NEWS
Reported by:	w.schwarzenfeld@utanet.at
Submitted by:	Joseph Mingrone <jrm@ftfl.ca> (maintainer)
This commit is contained in:
Kurt Jaeger 2016-08-25 03:20:23 +00:00
parent 4edabc2053
commit ec57a2ae61
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=420833
5 changed files with 58 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sysutils/slurm-wlm/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= slurm
PORTVERSION= 15.08.12
PORTVERSION= 16.05.4
CATEGORIES= sysutils
MASTER_SITES= http://www.schedmd.com/download/latest/ \
http://www.schedmd.com/download/archive/ \
@ -27,7 +27,7 @@ USE_LDCONFIG= yes
USE_RC_SUBR= slurmctld slurmd
PLIST_SUB= PORTVERSION="${PORTVERSION}"
INSTALL_TARGET= install-strip
USES= gmake libtool pkgconfig python:build tar:bz2
USES= gmake libtool pkgconfig python:build ssl tar:bz2
USE_PERL5= configure
OPTIONS_DEFINE= CURL DOCS GTK2 HDF5 HWLOC IPMI MYSQL RRD
@ -41,13 +41,17 @@ HWLOC_DESC= Portable hardware locality
IPMI_DESC= IPMI engergy consumption accounting
RRD_DESC= RRD external sensor data collection
GTK2_USE= GNOME=glib20,gtk20
DOCS_BUILD_DEPENDS= man2html:textproc/man2html
CURL_LIB_DEPENDS= libcurl.so:ftp/curl
CURL_CONFIGURE_WITH= libcurl
GTK2_USE= GNOME=cairo,gdkpixbuf2,glib20,gtk20
GTK2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
GTK2_USES= gettext
GTK2_CONFIGURE_ENV_OFF= ac_gtk_test=no
HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 \
libsz.so:science/szip
HDF5_CONFIGURE_WITH= hdf5
@ -58,11 +62,12 @@ HWLOC_CONFIGURE_WITH= hwloc
IPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi
IPMI_CONFIGURE_WITH= freeipmi
MYSQL_USES= mysql
MYSQL_CONFIGURE_with= mysql
RRD_LIB_DEPENDS= librrd.so:databases/rrdtool
RRD_CONFIGURE_WITH= rrdtool
MYSQL_USE= MYSQL=yes
CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lkvm

6
sysutils/slurm-wlm/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1464963064
SHA256 (slurm-15.08.12.tar.bz2) = d73785c17af41996b91806187e3debf7fa6141a459948b1c3c625f92bf7ac3c9
SIZE (slurm-15.08.12.tar.bz2) = 5805740
TIMESTAMP = 1472066022
SHA256 (slurm-16.05.4.tar.bz2) = 0e047df145c12ce3d723ac239b03450575c3578fd05d8710ab6ec691f4886717
SIZE (slurm-16.05.4.tar.bz2) = 5964431

11
sysutils/slurm-wlm/files/patch-doc_man_man2html.py Normal file
View File

@ -0,0 +1,11 @@
--- doc/man/man2html.py.orig 2016-08-24 23:46:50 UTC
+++ doc/man/man2html.py
@@ -180,7 +180,7 @@ version = sys.argv[1]
for f in sys.argv[4:]:
posLastDot = f.rfind(".")
mhtmlname = f[:posLastDot] + ".mhtml"
- cmd = "man2html " + f + "> " + mhtmlname
+ cmd = "man2html < " + f + "> " + mhtmlname
os.system(cmd)
print(">>>>>>> " + mhtmlname)
files.append(mhtmlname)

15
sysutils/slurm-wlm/files/patch-src_plugins_node__features_knl__cray_node__features__knl__cray.c Normal file
View File

@ -0,0 +1,15 @@
--- src/plugins/node_features/knl_cray/node_features_knl_cray.c.orig 2016-08-24 19:28:33 UTC
+++ src/plugins/node_features/knl_cray/node_features_knl_cray.c
@@ -39,6 +39,12 @@
#endif
#define _GNU_SOURCE /* For POLLRDHUP */
+
+#if defined (__FreeBSD__)
+# define POLLRDHUP POLLHUP
+# include <signal.h>
+#endif
+
#include <ctype.h>
#include <poll.h>
#include <signal.h>

25
sysutils/slurm-wlm/pkg-plist
View File

@ -31,12 +31,12 @@ lib/libpmi.so.0
lib/libpmi.so.0.0.0
lib/libslurm.a
lib/libslurm.so
lib/libslurm.so.29
lib/libslurm.so.29.0.0
lib/libslurm.so.30
lib/libslurm.so.30.0.0
lib/libslurmdb.a
lib/libslurmdb.so
lib/libslurmdb.so.29
lib/libslurmdb.so.29.0.0
lib/libslurmdb.so.30
lib/libslurmdb.so.30.0.0
lib/slurm/accounting_storage_filetxt.a
lib/slurm/accounting_storage_filetxt.so
%%MYSQL%%lib/slurm/accounting_storage_mysql.a
@ -103,8 +103,6 @@ lib/slurm/job_container_none.a
lib/slurm/job_container_none.so
lib/slurm/job_submit_all_partitions.a
lib/slurm/job_submit_all_partitions.so
lib/slurm/job_submit_cnode.a
lib/slurm/job_submit_cnode.so
lib/slurm/job_submit_cray.a
lib/slurm/job_submit_cray.so
lib/slurm/job_submit_defaults.a
@ -145,6 +143,12 @@ lib/slurm/layouts_power_default.a
lib/slurm/layouts_power_default.so
lib/slurm/layouts_unit_default.a
lib/slurm/layouts_unit_default.so
lib/slurm/mcs_group.a
lib/slurm/mcs_group.so
lib/slurm/mcs_none.a
lib/slurm/mcs_none.so
lib/slurm/mcs_user.a
lib/slurm/mcs_user.so
lib/slurm/mpi_lam.a
lib/slurm/mpi_lam.so
lib/slurm/mpi_mpich1_p4.a
@ -163,6 +167,8 @@ lib/slurm/mpi_openmpi.a
lib/slurm/mpi_openmpi.so
lib/slurm/mpi_pmi2.a
lib/slurm/mpi_pmi2.so
lib/slurm/node_features_knl_cray.a
lib/slurm/node_features_knl_cray.so
lib/slurm/power_none.a
lib/slurm/power_none.so
lib/slurm/preempt_job_prio.a
@ -404,6 +410,7 @@ man/man5/cgroup.conf.5.gz
man/man5/cray.conf.5.gz
man/man5/ext_sensors.conf.5.gz
man/man5/gres.conf.5.gz
man/man5/knl.conf.5.gz
man/man5/nonstop.conf.5.gz
man/man5/slurm.conf.5.gz
man/man5/slurmdbd.conf.5.gz
@ -478,6 +485,7 @@ sbin/slurmstepd
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm_pe_fig1.png
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm_pe_fig2.png
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/intel_knl.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_array.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_container_plugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_exit_code.html
@ -486,6 +494,7 @@ sbin/slurmstepd
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/jobacct_gatherplugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/jobcompplugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/k_function.gif
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/knl.conf.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/launch_plugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/licenses.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/linuxstyles.css
@ -494,12 +503,15 @@ sbin/slurmstepd
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/maui.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mc_support.gif
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mc_support.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mcs.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mcs_plugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/meetings.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/moab.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mpi_guide.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mpiplugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/multi_cluster.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/news.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/node_features_plugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/nonstop.conf.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/overview.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex1.gif
@ -571,7 +583,6 @@ sbin/slurmstepd
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sshare.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sstat.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/strigger.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sun_const.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sview.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/switchplugins.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/taskplugins.html