diff options
author | Justin Lecher <jlec@gentoo.org> | 2017-07-09 17:35:55 +0100 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2017-07-09 19:48:30 +0100 |
commit | f642dbad4a32533562e287dbbe0a96d5e48b61a0 (patch) | |
tree | 21210baf96c5895aff8e2e578398f4d23b12c716 /sys-cluster/slurm/files | |
parent | sys-cluster/slurm: Fix compilation error with glibc-2.25 (diff) | |
download | gentoo-f642dbad4a32533562e287dbbe0a96d5e48b61a0.tar.gz gentoo-f642dbad4a32533562e287dbbe0a96d5e48b61a0.tar.bz2 gentoo-f642dbad4a32533562e287dbbe0a96d5e48b61a0.zip |
sys-cluster/slurm: Version Bump
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=621144
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'sys-cluster/slurm/files')
3 files changed, 152 insertions, 21 deletions
diff --git a/sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch b/sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch index 5b861c333019..1e4a5b4fae3a 100644 --- a/sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch +++ b/sys-cluster/slurm/files/slurm-16.05.2-disable-sview.patch @@ -67,24 +67,3 @@ diff -urN slurm-16.05.2.orig/src/Makefile.am slurm-16.05.2/src/Makefile.am if !REAL_BG_L_P_LOADED SUBDIRS += srun -diff -urN slurm-16.05.2.orig/src/Makefile.in slurm-16.05.2/src/Makefile.in ---- slurm-16.05.2.orig/src/Makefile.in 2016-07-07 02:51:37.000000000 +0300 -+++ slurm-16.05.2/src/Makefile.in 2016-07-15 20:02:41.373270765 +0300 -@@ -199,7 +199,7 @@ - DIST_SUBDIRS = api bcast common database db_api layouts plugins sacct \ - sacctmgr salloc sattach sbatch sbcast scancel scontrol sdiag \ - sinfo slurmctld slurmd slurmdbd smap smd sprio squeue sreport \ -- srun_cr sshare sstat strigger sview srun -+ srun_cr sshare sstat strigger srun - am__DIST_COMMON = $(srcdir)/Makefile.in - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - am__relativize = \ -@@ -487,7 +487,7 @@ - SUBDIRS = api bcast common database db_api layouts plugins sacct \ - sacctmgr salloc sattach sbatch sbcast scancel scontrol sdiag \ - sinfo slurmctld slurmd slurmdbd smap smd sprio squeue sreport \ -- srun_cr sshare sstat strigger sview $(am__append_1) -+ srun_cr sshare sstat strigger $(am__append_1) - all: all-recursive - - .SUFFIXES: diff --git a/sys-cluster/slurm/files/slurm-17.02.6-disable-sview.patch b/sys-cluster/slurm/files/slurm-17.02.6-disable-sview.patch new file mode 100644 index 000000000000..f7e2c5b26739 --- /dev/null +++ b/sys-cluster/slurm/files/slurm-17.02.6-disable-sview.patch @@ -0,0 +1,99 @@ + configure.ac | 39 --------------------------------------- + doc/man/man1/Makefile.am | 8 -------- + src/Makefile.am | 3 +-- + 3 files changed, 1 insertion(+), 49 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2f177ec..ff4d69b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -238,44 +238,6 @@ AC_SUBST(HAVE_SOME_CURSES) + PKG_CHECK_MODULES([CHECK], [check >= 0.9.8], [ac_have_check="yes"], [ac_have_check="no"]) + AM_CONDITIONAL(HAVE_CHECK, test "x$ac_have_check" = "xyes") + +-# +-# Tests for GTK+ +-# +- +-# use the correct libs if running on 64bit +-if test -d "/usr/lib64/pkgconfig"; then +- PKG_CONFIG_PATH="/usr/lib64/pkgconfig/:$PKG_CONFIG_PATH" +-fi +- +-if test -d "/opt/gnome/lib64/pkgconfig"; then +- PKG_CONFIG_PATH="/opt/gnome/lib64/pkgconfig/:$PKG_CONFIG_PATH" +-fi +- +-AM_PATH_GLIB_2_0([2.7.1], [ac_glib_test="yes"], [ac_glib_test="no"], [gthread]) +- +-if test ${glib_config_minor_version=0} -ge 32 ; then +- AC_DEFINE([GLIB_NEW_THREADS], 1, [Define to 1 if using glib-2.32.0 or higher]) +-fi +- +-AM_PATH_GTK_2_0([2.7.1], [ac_gtk_test="yes"], [ac_gtk_test="no"], [gthread]) +-if test ${gtk_config_minor_version=0} -ge 10 ; then +- AC_DEFINE([GTK2_USE_RADIO_SET], 1, [Define to 1 if using gtk+-2.10.0 or higher]) +-fi +- +-if test ${gtk_config_minor_version=0} -ge 12 ; then +- AC_DEFINE([GTK2_USE_TOOLTIP], 1, [Define to 1 if using gtk+-2.12.0 or higher]) +-fi +- +-if test ${gtk_config_minor_version=0} -ge 14 ; then +- AC_DEFINE([GTK2_USE_GET_FOCUS], 1, [Define to 1 if using gtk+-2.14.0 or higher]) +-fi +- +-if test "x$ac_glib_test" != "xyes" -o "x$ac_gtk_test" != "xyes"; then +- AC_MSG_WARN([cannot build sview without gtk library]); +-fi +- +-AM_CONDITIONAL(BUILD_SVIEW, [test "x$ac_glib_test" = "xyes"] && [test "x$ac_gtk_test" = "xyes"]) +- + dnl Cray ALPS/Basil support depends on mySQL + X_AC_CRAY + +@@ -477,7 +439,6 @@ AC_CONFIG_FILES([Makefile + src/sshare/Makefile + src/sstat/Makefile + src/strigger/Makefile +- src/sview/Makefile + src/plugins/Makefile + src/plugins/accounting_storage/Makefile + src/plugins/accounting_storage/common/Makefile +diff --git a/doc/man/man1/Makefile.am b/doc/man/man1/Makefile.am +index 246f16d..ba39af2 100644 +--- a/doc/man/man1/Makefile.am ++++ b/doc/man/man1/Makefile.am +@@ -29,10 +29,6 @@ if WITH_BLCR + man1_MANS += srun_cr.1 + endif + +-if BUILD_SVIEW +-man1_MANS += sview.1 +-endif +- + EXTRA_DIST = $(man1_MANS) + + if HAVE_MAN2HTML +@@ -65,10 +61,6 @@ if WITH_BLCR + html_DATA += srun_cr.html + endif + +-if BUILD_SVIEW +-html_DATA += sview.html +-endif +- + MOSTLYCLEANFILES = ${html_DATA} + + EXTRA_DIST += $(html_DATA) +diff --git a/src/Makefile.am b/src/Makefile.am +index bcd5aa7..a8cbf17 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -28,5 +28,4 @@ SUBDIRS = \ + srun_cr \ + sshare \ + sstat \ +- strigger \ +- sview ++ strigger 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 new file mode 100644 index 000000000000..dc48f8475c00 --- /dev/null +++ b/sys-cluster/slurm/files/slurm-17.02.6-glibc-2.25.patch @@ -0,0 +1,53 @@ +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" |