Page MenuHomeFreeBSD
Files F148785634

D8411.id21945.diff
No OneTemporary
Actions

D8411.id21945.diff
View Options

Index: sysutils/slurm-wlm/Makefile
===================================================================
--- sysutils/slurm-wlm/Makefile
+++ 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_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 @@
# 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/
Index: sysutils/slurm-wlm/distinfo
===================================================================
--- sysutils/slurm-wlm/distinfo
+++ 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
Index: sysutils/slurm-wlm/files/patch-src_plugins_node__features_knl__generic_node__features__knl__generic.c
===================================================================
--- /dev/null
+++ 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"
Index: sysutils/slurm-wlm/pkg-plist
===================================================================
--- sysutils/slurm-wlm/pkg-plist
+++ sysutils/slurm-wlm/pkg-plist
@@ -169,6 +169,8 @@
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

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 21, 5:26 AM (4 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30063259
Default Alt Text
D8411.id21945.diff (2 KB)

Event Timeline