diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-11-15 17:13:45 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-11-15 17:13:45 +0000 |
commit | e2d84e38284aeb9d522a7e935554340ddf0e4a6f (patch) | |
tree | 5a7444ee5f2af59431481999f729676090b1e0f3 /sys-cluster/slurm/files | |
parent | 519e4d5d99fc43d5c9a038098c029dc4ef9d6792 (diff) |
gentoo resync : 15.11.2017
Diffstat (limited to 'sys-cluster/slurm/files')
-rw-r--r-- | sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch (renamed from sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch) | 0 | ||||
-rw-r--r-- | sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch (renamed from sys-cluster/slurm/files/slurm-16.05.2-sysmacros.patch) | 0 | ||||
-rw-r--r-- | sys-cluster/slurm/files/slurm-17.02.6-glibc-2.25.patch | 53 | ||||
-rw-r--r-- | sys-cluster/slurm/files/slurm-17.02.9-disable-sview.patch (renamed from sys-cluster/slurm/files/slurm-17.02.6-disable-sview.patch) | 0 |
4 files changed, 0 insertions, 53 deletions
diff --git a/sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch b/sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch index 1e4a5b4fae3a..1e4a5b4fae3a 100644 --- a/sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch +++ b/sys-cluster/slurm/files/slurm-16.05.11-disable-sview.patch diff --git a/sys-cluster/slurm/files/slurm-16.05.2-sysmacros.patch b/sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch index f9d22f479f89..f9d22f479f89 100644 --- a/sys-cluster/slurm/files/slurm-16.05.2-sysmacros.patch +++ b/sys-cluster/slurm/files/slurm-16.05.11-sysmacros.patch diff --git a/sys-cluster/slurm/files/slurm-17.02.6-glibc-2.25.patch b/sys-cluster/slurm/files/slurm-17.02.6-glibc-2.25.patch deleted file mode 100644 index dc48f8475c00..000000000000 --- a/sys-cluster/slurm/files/slurm-17.02.6-glibc-2.25.patch +++ /dev/null @@ -1,53 +0,0 @@ -commit 056d9ff26b1d2ccac45da3c26a6918f182f8c559 -Author: Justin Lecher <jlec@gentoo.org> -Date: Sun Jul 9 15:54:20 2017 +0100 - - Include sysmacros.h in addition for major() & minor() - - Starting from glibc-2.25 [1] the macros major and minor are only available - from sys/sysmacros.h. This patch uses an autoconf macro to detect the - location and includes the header accordingly. - - 1) - https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html - - Signed-off-by: Justin Lecher <jlec@gentoo.org> - -diff --git a/configure.ac b/configure.ac -index 44699ae095..66d4350d44 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -124,7 +124,7 @@ AC_CHECK_HEADERS(mcheck.h values.h socket.h sys/socket.h \ - AC_HEADER_SYS_WAIT - AC_HEADER_TIME - AC_HEADER_STDC -- -+AC_HEADER_MAJOR - - dnl Checks for structures. - dnl -diff --git a/src/plugins/task/cgroup/task_cgroup_devices.c b/src/plugins/task/cgroup/task_cgroup_devices.c -index 6a09b3d52a..63c0a11c9e 100644 ---- a/src/plugins/task/cgroup/task_cgroup_devices.c -+++ b/src/plugins/task/cgroup/task_cgroup_devices.c -@@ -34,12 +34,20 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - \*****************************************************************************/ - -+#include "config.h" -+ - #define _GNU_SOURCE - #include <glob.h> - #include <limits.h> - #include <sched.h> - #include <sys/stat.h> - #include <sys/types.h> -+#ifdef MAJOR_IN_MKDEV -+# include <sys/mkdev.h> -+#endif -+#ifdef MAJOR_IN_SYSMACROS -+# include <sys/sysmacros.h> -+#endif - - #include "slurm/slurm.h" - #include "slurm/slurm_errno.h" diff --git a/sys-cluster/slurm/files/slurm-17.02.6-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.02.9-disable-sview.patch index f7e2c5b26739..f7e2c5b26739 100644 --- a/sys-cluster/slurm/files/slurm-17.02.6-disable-sview.patch +++ b/sys-cluster/slurm/files/slurm-17.02.9-disable-sview.patch |