| 1 |
commit: 7c939e7a1b163ab5a754ba6592067be14ed9158c |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 9 14:50:58 2017 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 9 18:48:30 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c939e7a |
| 7 |
|
| 8 |
sys-cluster/slurm: Fix compilation error with glibc-2.25 |
| 9 |
|
| 10 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=617192 |
| 11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 12 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 13 |
|
| 14 |
.../slurm/files/slurm-16.05.2-sysmacros.patch | 34 ++++++++++++++++++++++ |
| 15 |
sys-cluster/slurm/slurm-16.05.2.ebuild | 5 ++-- |
| 16 |
2 files changed, 37 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-cluster/slurm/files/slurm-16.05.2-sysmacros.patch b/sys-cluster/slurm/files/slurm-16.05.2-sysmacros.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..f9d22f479f8 |
| 21 |
--- /dev/null |
| 22 |
+++ b/sys-cluster/slurm/files/slurm-16.05.2-sysmacros.patch |
| 23 |
@@ -0,0 +1,34 @@ |
| 24 |
+ configure.ac | 2 +- |
| 25 |
+ src/plugins/task/cgroup/task_cgroup_devices.c | 6 ++++++ |
| 26 |
+ 2 files changed, 7 insertions(+), 1 deletion(-) |
| 27 |
+ |
| 28 |
+diff --git a/configure.ac b/configure.ac |
| 29 |
+index 869a989..2936983 100644 |
| 30 |
+--- a/configure.ac |
| 31 |
++++ b/configure.ac |
| 32 |
+@@ -141,7 +141,7 @@ AC_CHECK_HEADERS(mcheck.h values.h socket.h sys/socket.h \ |
| 33 |
+ AC_HEADER_SYS_WAIT |
| 34 |
+ AC_HEADER_TIME |
| 35 |
+ AC_HEADER_STDC |
| 36 |
+- |
| 37 |
++AC_HEADER_MAJOR |
| 38 |
+ |
| 39 |
+ dnl Checks for structures. |
| 40 |
+ dnl |
| 41 |
+diff --git a/src/plugins/task/cgroup/task_cgroup_devices.c b/src/plugins/task/cgroup/task_cgroup_devices.c |
| 42 |
+index 554583c..9be99d8 100644 |
| 43 |
+--- a/src/plugins/task/cgroup/task_cgroup_devices.c |
| 44 |
++++ b/src/plugins/task/cgroup/task_cgroup_devices.c |
| 45 |
+@@ -42,6 +42,12 @@ |
| 46 |
+ #include <sched.h> |
| 47 |
+ #include <glob.h> |
| 48 |
+ #include <sys/types.h> |
| 49 |
++#ifdef MAJOR_IN_MKDEV |
| 50 |
++# include <sys/mkdev.h> |
| 51 |
++#endif |
| 52 |
++#ifdef MAJOR_IN_SYSMACROS |
| 53 |
++# include <sys/sysmacros.h> |
| 54 |
++#endif |
| 55 |
+ #include <sys/stat.h> |
| 56 |
+ #include <slurm/slurm.h> |
| 57 |
+ #include <slurm/slurm_errno.h> |
| 58 |
|
| 59 |
diff --git a/sys-cluster/slurm/slurm-16.05.2.ebuild b/sys-cluster/slurm/slurm-16.05.2.ebuild |
| 60 |
index 2561857e107..9e0f02d6bbf 100644 |
| 61 |
--- a/sys-cluster/slurm/slurm-16.05.2.ebuild |
| 62 |
+++ b/sys-cluster/slurm/slurm-16.05.2.ebuild |
| 63 |
@@ -1,4 +1,4 @@ |
| 64 |
-# Copyright 1999-2016 Gentoo Foundation |
| 65 |
+# Copyright 1999-2017 Gentoo Foundation |
| 66 |
# Distributed under the terms of the GNU General Public License v2 |
| 67 |
|
| 68 |
EAPI=6 |
| 69 |
@@ -53,7 +53,8 @@ LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl" |
| 70 |
RESTRICT="primaryuri" |
| 71 |
|
| 72 |
PATCHES=( |
| 73 |
- "${FILESDIR}/${P}-disable-sview.patch" |
| 74 |
+ "${FILESDIR}"/${P}-disable-sview.patch |
| 75 |
+ "${FILESDIR}"/${P}-sysmacros.patch |
| 76 |
) |
| 77 |
|
| 78 |
src_unpack() { |
Archives