diff options
| author | jrm <jrm@FreeBSD.org> | 2016-11-03 03:47:27 +0800 |
|---|---|---|
| committer | jrm <jrm@FreeBSD.org> | 2016-11-03 03:47:27 +0800 |
| commit | 54b2b93a2c1691161245d26444b5dd613a6cc4cc (patch) | |
| tree | 86d4f327ff4cce30fd18c49adb87baa1618cbb1f /sysutils/slurm-wlm | |
| parent | 5999d63900b78d1e7890563ff599737b4435bdb2 (diff) | |
| download | freebsd-ports-gnome-54b2b93a2c1691161245d26444b5dd613a6cc4cc.tar.gz freebsd-ports-gnome-54b2b93a2c1691161245d26444b5dd613a6cc4cc.tar.zst freebsd-ports-gnome-54b2b93a2c1691161245d26444b5dd613a6cc4cc.zip | |
sysutils/slurm-wlm: update to version 16.05.06
Changes in Slurm 16.05.6:
https://github.com/SchedMD/slurm/blob/master/NEWS
Port changes: Added a patch to fix a build issue. The patch was also
accepted upstream and should appear in the next Slurm release.
Reviewed by: mat
Approved by: swills (mentor)
Differential Revision: https://reviews.freebsd.org/D8411
Diffstat (limited to 'sysutils/slurm-wlm')
| -rw-r--r-- | sysutils/slurm-wlm/Makefile | 10 | ||||
| -rw-r--r-- | sysutils/slurm-wlm/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/slurm-wlm/files/patch-src_plugins_node__features_knl__generic_node__features__knl__generic.c | 13 | ||||
| -rw-r--r-- | sysutils/slurm-wlm/pkg-plist | 2 |
4 files changed, 22 insertions, 9 deletions
diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile index dc1f517086fd..2fb7dd656bda 100644 --- a/sysutils/slurm-wlm/Makefile +++ b/sysutils/slurm-wlm/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= slurm -PORTVERSION= 16.05.5 +PORTVERSION= 16.05.6 CATEGORIES= sysutils MASTER_SITES= http://www.schedmd.com/download/latest/ \ http://www.schedmd.com/download/archive/ \ @@ -27,8 +27,10 @@ USE_LDCONFIG= yes USE_RC_SUBR= slurmctld slurmd PLIST_SUB= PORTVERSION="${PORTVERSION}" INSTALL_TARGET= install-strip -USES= gmake libtool pkgconfig python:build readline ssl tar:bz2 +USES= gmake libtool pkgconfig python:build readline shebangfix ssl \ + tar:bz2 USE_PERL5= configure +SHEBANG_FILES= doc/html/shtml2html.py doc/man/man2html.py OPTIONS_DEFINE= CURL DOCS GTK2 HDF5 HWLOC IPMI MYSQL RRD OPTIONS_DEFAULT=HDF5 HWLOC @@ -76,10 +78,6 @@ LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lkvm # add a pty.h for the build. post-patch: ${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm - ${REINPLACE_CMD} \ - -e 's|/usr/bin/env python|${PYTHON_CMD}|g' \ - ${WRKSRC}/doc/html/shtml2html.py \ - ${WRKSRC}/doc/man/man2html.py post-install: ${INSTALL_DATA} ${FILESDIR}/slurm.conf.sample ${STAGEDIR}${PREFIX}/etc/ diff --git a/sysutils/slurm-wlm/distinfo b/sysutils/slurm-wlm/distinfo index c4daae87b37a..906357133c80 100644 --- a/sysutils/slurm-wlm/distinfo +++ b/sysutils/slurm-wlm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1475245168 -SHA256 (slurm-16.05.5.tar.bz2) = 28cfd6a15599842f46cd81ae240a2b01b01e71a677f7eec6d5ba16b38e3d54e9 -SIZE (slurm-16.05.5.tar.bz2) = 6247257 +TIMESTAMP = 1478012730 +SHA256 (slurm-16.05.6.tar.bz2) = 992b74f400f3821d60625d66797f56739f8571b80bad56211de0001791abf58b +SIZE (slurm-16.05.6.tar.bz2) = 6249232 diff --git a/sysutils/slurm-wlm/files/patch-src_plugins_node__features_knl__generic_node__features__knl__generic.c b/sysutils/slurm-wlm/files/patch-src_plugins_node__features_knl__generic_node__features__knl__generic.c new file mode 100644 index 000000000000..5b893b0a00a9 --- /dev/null +++ b/sysutils/slurm-wlm/files/patch-src_plugins_node__features_knl__generic_node__features__knl__generic.c @@ -0,0 +1,13 @@ +--- src/plugins/node_features/knl_generic/node_features_knl_generic.c.orig 2016-11-01 15:40:01 UTC ++++ src/plugins/node_features/knl_generic/node_features_knl_generic.c +@@ -46,6 +46,10 @@ + #include <sys/types.h> + #include <unistd.h> + ++#if defined(__FreeBSD__) || defined(__NetBSD__) ++#define POLLRDHUP POLLHUP ++#endif ++ + #include "slurm/slurm.h" + + #include "src/common/assoc_mgr.h" diff --git a/sysutils/slurm-wlm/pkg-plist b/sysutils/slurm-wlm/pkg-plist index 58457787f0b1..c5a9b25d40a4 100644 --- a/sysutils/slurm-wlm/pkg-plist +++ b/sysutils/slurm-wlm/pkg-plist @@ -169,6 +169,8 @@ 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/node_features_knl_generic.a +lib/slurm/node_features_knl_generic.so lib/slurm/power_none.a lib/slurm/power_none.so lib/slurm/preempt_job_prio.a |