svn commit: r436851 - in head/sysutils/slurm-wlm: . files

[Joseph Mingrone]

Author: jrm
Date: Fri Mar 24 18:52:28 2017
New Revision: 436851
URL: https://svnweb.freebsd.org/changeset/ports/436851

Log:
  sysutils/slurm-wlm: Fix task affinity, mysql and gtk2 options, update
  default slurm.conf, silence QA warning about liblz4, patch to make
  /usr/bin/mail the default.
  
  - Fix task affinity.  The reinplace for cpuset_setaffinity should not have
    been removed as it was not one of the patches incorporated upstream.
  
  - The MYSQL and GTK2 options were not functioning properly when off.  If
    mysql and gtk2 were installed during configure phase, slurm would build
    sview and mysql support whether or not the options were selected.
    Poudriere will not catch this sort of problem.  I tested by installing
    with all options enabled so that all possible dependencies would be
    installed, and then rebuilding with all options off.  No QA warnings in
    either case now.
  
  - Remove the outdated files/slurm.conf.sample.  Install a patched version
    of the included slurm.conf file instead.
  
  - Patch to make /usr/bin/mail the default, so that mail will work out of
    the box instead of requiring an override in slurm.conf.
  
  - Silence a QA warning about liblz4 by adding archivers/liblz4 to
    LIB_DEPENDS.
  
  PR:		218044
  Submitted by:	bacon4000 at gmail.com
  Approved by:	swills (mentor, implicit)

Deleted:
  head/sysutils/slurm-wlm/files/slurm.conf.sample
Modified:
  head/sysutils/slurm-wlm/Makefile
  head/sysutils/slurm-wlm/pkg-plist

Modified: head/sysutils/slurm-wlm/Makefile
==============================================================================
--- head/sysutils/slurm-wlm/Makefile	Fri Mar 24 18:43:30 2017	(r436850)
+++ head/sysutils/slurm-wlm/Makefile	Fri Mar 24 18:52:28 2017	(r436851)
@@ -3,6 +3,7 @@
 
 PORTNAME=	slurm
 PORTVERSION=	16.05.9
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.schedmd.com/download/latest/ \
 		http://www.schedmd.com/download/archive/ \
@@ -17,7 +18,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libsysinfo.so:devel/libsysinfo \
-		libmunge.so:security/munge
+		libmunge.so:security/munge \
+		liblz4.so:archivers/liblz4
 
 USERS=		slurm
 GROUPS=		${USERS}
@@ -52,7 +54,9 @@ GTK2_USE=		GNOME=cairo,gdkpixbuf2,glib20
 GTK2_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2
 GTK2_USES=		gettext
-GTK2_CONFIGURE_ENV_OFF=	ac_gtk_test=no
+# 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
@@ -66,6 +70,7 @@ IPMI_CONFIGURE_WITH=	freeipmi
 
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_with=	mysql
+MYSQL_CONFIGURE_OFF=	--with-mysql_config=/nonexistent
 
 RRD_LIB_DEPENDS=	librrd.so:databases/rrdtool
 RRD_CONFIGURE_WITH=	rrdtool
@@ -77,9 +82,32 @@ LDFLAGS+=	-L${LOCALBASE}/lib -lsysinfo -
 # #include <pty.h> with appropriate headers will therefore not work, so instead
 # add a pty.h for the build.
 post-patch:
-	${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm
+	@${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm
+	@${REINPLACE_CMD} -e 's|sched_setaffinity|cpuset_setaffinity|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|/bin/mail|/usr/bin/mail|g' \
+		${WRKSRC}/src/common/read_config.h \
+		${WRKSRC}/contribs/seff/smail.in \
+		${WRKSRC}/doc/html/configurator.easy.html.in \
+		${WRKSRC}/doc/html/configurator.html.in \
+		${WRKSRC}/contribs/cray/slurm.conf.template \
+		${WRKSRC}/doc/man/man1/strigger.1 \
+		${WRKSRC}/doc/man/man5/slurm.conf.5
+	@${REINPLACE_CMD} \
+		-e 's|=linux|=FreeBSD|g' \
+		-e 's|run/slurmctld.pid|run/slurm/slurmctld.pid|' \
+		-e 's|run/slurmd.pid|run/slurm/slurd.pid|' \
+		-e 's|SlurmdSpoolDir=.*|SlurmdSpoolDir=/var/spool/slurmd|' \
+		-e 's|StateSaveLocation=.*|StateSaveLocation=/var/run/slurm|' \
+		${WRKSRC}/etc/slurm.conf.example
+
+# Hack around nonfunctional --disable-gtktest flag
+post-patch-GTK2-off:
+	@${REINPLACE_CMD} -e 's|min_gtk_version=.*|min_gtk_version=2000.0.0|' \
+		${WRKSRC}/configure
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/slurm.conf.sample ${STAGEDIR}${PREFIX}/etc/
+	${INSTALL_DATA} ${WRKSRC}/etc/slurm.conf.example \
+		${STAGEDIR}${PREFIX}/etc/slurm.conf.sample
 
 .include <bsd.port.mk>

Modified: head/sysutils/slurm-wlm/pkg-plist
==============================================================================
--- head/sysutils/slurm-wlm/pkg-plist	Fri Mar 24 18:43:30 2017	(r436850)
+++ head/sysutils/slurm-wlm/pkg-plist	Fri Mar 24 18:52:28 2017	(r436851)
@@ -227,6 +227,8 @@ lib/slurm/switch_generic.a
 lib/slurm/switch_generic.so
 lib/slurm/switch_none.a
 lib/slurm/switch_none.so
+lib/slurm/task_affinity.a
+lib/slurm/task_affinity.so
 lib/slurm/task_cgroup.a
 lib/slurm/task_cgroup.so
 lib/slurm/task_cray.a