slurm: Clean up, enable mysql on Linux

[Jason W. Bacon <bacon%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Mon Feb 26 13:27:20 2018 -0600
Changeset:	df9505b980ad01ec07aacc1a1f33a213693c01ff

Modified Files:
	slurm/Makefile
	slurm/distinfo
	slurm/patches/patch-src_slurmd_common_task__plugin.c
	slurm/patches/patch-src_slurmd_common_task__plugin.h
	slurm/patches/patch-src_slurmd_slurmd_slurmd.c
	slurm/patches/patch-src_slurmd_slurmd_slurmd.h
	slurm/patches/patch-src_slurmd_slurmstepd_io.c
Added Files:
	slurm/patches/patch-src_plugins_task_cgroup_task__cgroup__memory.c

Log Message:
slurm: Clean up, enable mysql on Linux

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=df9505b980ad01ec07aacc1a1f33a213693c01ff

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 slurm/Makefile                                           | 12 ++++++------
 slurm/distinfo                                           | 11 ++++++-----
 .../patch-src_plugins_task_cgroup_task__cgroup__memory.c | 16 ++++++++++++++++
 slurm/patches/patch-src_slurmd_common_task__plugin.c     |  2 ++
 slurm/patches/patch-src_slurmd_common_task__plugin.h     |  2 ++
 slurm/patches/patch-src_slurmd_slurmd_slurmd.c           |  2 ++
 slurm/patches/patch-src_slurmd_slurmd_slurmd.h           |  2 ++
 slurm/patches/patch-src_slurmd_slurmstepd_io.c           |  2 ++
 8 files changed, 38 insertions(+), 11 deletions(-)

diffs:
diff --git a/slurm/Makefile b/slurm/Makefile
index eac55e3b95..b67c34ebf8 100644
--- a/slurm/Makefile
+++ b/slurm/Makefile
@@ -19,15 +19,13 @@ BUILD_DEPENDS+=	man2html-[0-9]*:../../wip/man2html
 USE_LANGUAGES=	c c++
 
 GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake perl pkg-config
+USE_TOOLS+=	perl pkg-config
 USE_LIBTOOL=	yes
 
 # Help find pkgsrc man2html
 CONFIGURE_ARGS+=	--bindir=${PREFIX}/bin
 CONFIGURE_ARGS+=	--htmldir=${PREFIX}/share/doc/${PKGNAME_NOREV}/html
 CONFIGURE_ARGS+=	--with-munge=${BUILDLINK_PREFIX.munge}
-# Add mysql option
-CONFIGURE_ARGS+=	--with-mysql_config=/nonexistent
 CONFIGURE_ARGS+=	--with-hwloc=${PREFIX}
 
 LDFLAGS+=		-llz4
@@ -69,6 +67,7 @@ SUBST_SED.make-ex=	-e 's|${WRKDIR}|<build-prefix>|g'
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == NetBSD
+CONFIGURE_ARGS+=	--with-mysql_config=/nonexistent
 SUBST_CLASSES+=		undef1
 SUBST_STAGE.undef1=	post-configure
 SUBST_FILES.undef1=	src/plugins/acct_gather_profile/hdf5/sh5util/Makefile
@@ -97,10 +96,11 @@ post-install:
 .include "../../devel/readline/buildlink3.mk"
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../textproc/json-c/buildlink3.mk"
+.if ${OPSYS} == Linux
+.include "../../mk/mysql.buildlink3.mk"
+.endif
+.include "../../mk/pam.buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
-.include "../../databases/mysql57-client/buildlink3.mk"
-# vuln in 55 and 56 .include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
-.include "../../mk/pam.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/slurm/distinfo b/slurm/distinfo
index c6f649ace9..b13f2dfebb 100644
--- a/slurm/distinfo
+++ b/slurm/distinfo
@@ -5,9 +5,10 @@ RMD160 (slurm-17.11.3.tar.bz2) = 15d938bc0cf72ffd569f71607803e395f98a9fe3
 SHA512 (slurm-17.11.3.tar.bz2) = 0e4f705e37cad4b95e95af5544b926093b0f20ba3027500212dc55a06460f35fc3fa62b67038311a148c1708598988aa6252748fd0bba7af15c3f098b134e293
 Size (slurm-17.11.3.tar.bz2) = 6197308 bytes
 SHA1 (patch-etc_init.d.slurm.in) = beaedd5385b4aad04583d2bc5a23557519f74ec5
-SHA1 (patch-src_slurmd_common_task__plugin.c) = b82ecb8daf1daa8d84edc90a01b4cd70bf6be7c2
-SHA1 (patch-src_slurmd_common_task__plugin.h) = 5a2beb274295770e81d945a2bb164ec919b91d3a
-SHA1 (patch-src_slurmd_slurmd_slurmd.c) = d101a3274ef5d02366a10b815d81be1c6022e614
-SHA1 (patch-src_slurmd_slurmd_slurmd.h) = 6e65ea3ce78a63df4968ed3d1432fef60c51d9d9
-SHA1 (patch-src_slurmd_slurmstepd_io.c) = c637615ca6b2e6c1505cd358e1d9f0ea30d8ca93
+SHA1 (patch-src_plugins_task_cgroup_task__cgroup__memory.c) = 967c2c5ba4ed880d81ee10681eb7bc4ce408d215
+SHA1 (patch-src_slurmd_common_task__plugin.c) = 0d6680b10b45648703fe7a57411e605992fd9040
+SHA1 (patch-src_slurmd_common_task__plugin.h) = d4ad9f350efe1e873809adfe9dc4f559634e9ba2
+SHA1 (patch-src_slurmd_slurmd_slurmd.c) = 67cac6d8b4545c9053b655a4da77db63f5de7e63
+SHA1 (patch-src_slurmd_slurmd_slurmd.h) = a610b0bbe5b6b04be70eb2f8eac2a231139e6d1a
+SHA1 (patch-src_slurmd_slurmstepd_io.c) = b56782887621edb539be70d53dff8029a89e90ed
 SHA1 (patch-src_slurmd_slurmstepd_task.c) = 7948c76ce65b0e5211486d2e7b1901664c1f7016
diff --git a/slurm/patches/patch-src_plugins_task_cgroup_task__cgroup__memory.c b/slurm/patches/patch-src_plugins_task_cgroup_task__cgroup__memory.c
new file mode 100644
index 0000000000..e94babddbf
--- /dev/null
+++ b/slurm/patches/patch-src_plugins_task_cgroup_task__cgroup__memory.c
@@ -0,0 +1,16 @@
+$NetBSD$
+
+# No eventfd on NetBSD 7
+
+--- src/plugins/task/cgroup/task_cgroup_memory.c.orig	2018-02-26 19:16:37.000000000 +0000
++++ src/plugins/task/cgroup/task_cgroup_memory.c
+@@ -39,7 +39,9 @@
+ #include <poll.h>
+ #include <signal.h>
+ #include <stdlib.h>		/* getenv */
++#ifndef __NetBSD__
+ #include <sys/eventfd.h>
++#endif
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
diff --git a/slurm/patches/patch-src_slurmd_common_task__plugin.c b/slurm/patches/patch-src_slurmd_common_task__plugin.c
index b75fa98154..db8db35ce2 100644
--- a/slurm/patches/patch-src_slurmd_common_task__plugin.c
+++ b/slurm/patches/patch-src_slurmd_common_task__plugin.c
@@ -1,5 +1,7 @@
 $NetBSD$
 
+# cpuset functions not standardized across platforms
+
 --- src/slurmd/common/task_plugin.c.orig	2018-01-05 18:03:10.000000000 +0000
 +++ src/slurmd/common/task_plugin.c
 @@ -542,7 +542,11 @@ extern void task_slurm_chkaffinity(cpu_s
diff --git a/slurm/patches/patch-src_slurmd_common_task__plugin.h b/slurm/patches/patch-src_slurmd_common_task__plugin.h
index 0418b57a67..2166926185 100644
--- a/slurm/patches/patch-src_slurmd_common_task__plugin.h
+++ b/slurm/patches/patch-src_slurmd_common_task__plugin.h
@@ -1,5 +1,7 @@
 $NetBSD$
 
+# cpuset functions not standardized across platforms
+
 --- src/slurmd/common/task_plugin.h.orig	2018-01-04 21:15:01.000000000 +0000
 +++ src/slurmd/common/task_plugin.h
 @@ -42,6 +42,16 @@
diff --git a/slurm/patches/patch-src_slurmd_slurmd_slurmd.c b/slurm/patches/patch-src_slurmd_slurmd_slurmd.c
index 831fff56b8..33a5800a30 100644
--- a/slurm/patches/patch-src_slurmd_slurmd_slurmd.c
+++ b/slurm/patches/patch-src_slurmd_slurmd_slurmd.c
@@ -1,5 +1,7 @@
 $NetBSD$
 
+# cpuset functions not standardized across platforms
+
 --- src/slurmd/slurmd/slurmd.c.orig	2018-01-04 21:15:01.000000000 +0000
 +++ src/slurmd/slurmd/slurmd.c
 @@ -2067,7 +2067,13 @@ static int _core_spec_init(void)
diff --git a/slurm/patches/patch-src_slurmd_slurmd_slurmd.h b/slurm/patches/patch-src_slurmd_slurmd_slurmd.h
index 2e6ef143fd..662a4a53b6 100644
--- a/slurm/patches/patch-src_slurmd_slurmd_slurmd.h
+++ b/slurm/patches/patch-src_slurmd_slurmd_slurmd.h
@@ -1,5 +1,7 @@
 $NetBSD$
 
+# cpuset functions not standardized across platforms
+
 --- src/slurmd/slurmd/slurmd.h.orig	2018-01-04 21:15:01.000000000 +0000
 +++ src/slurmd/slurmd/slurmd.h
 @@ -48,6 +48,16 @@
diff --git a/slurm/patches/patch-src_slurmd_slurmstepd_io.c b/slurm/patches/patch-src_slurmd_slurmstepd_io.c
index 15216726ef..9af3acac83 100644
--- a/slurm/patches/patch-src_slurmd_slurmstepd_io.c
+++ b/slurm/patches/patch-src_slurmd_slurmstepd_io.c
@@ -1,5 +1,7 @@
 $NetBSD$
 
+# Portability
+
 --- src/slurmd/slurmstepd/io.c.orig	2018-01-05 23:43:03.000000000 +0000
 +++ src/slurmd/slurmstepd/io.c
 @@ -45,6 +45,7 @@