commit: db298e566fb30a5038dfca41a0199a00f95a78e1
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 21 09:21:56 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 09:22:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db298e56
sys-cluster/slurm: re-introduce sview disabling
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
sys-cluster/slurm/files/disable-sview.patch | 76 +++++++++++++++++++++++++++++
sys-cluster/slurm/slurm-19.05.4.1.ebuild | 2 +
2 files changed, 78 insertions(+)
diff --git a/sys-cluster/slurm/files/disable-sview.patch
b/sys-cluster/slurm/files/disable-sview.patch
new file mode 100644
index 00000000000..f409765a847
--- /dev/null
+++ b/sys-cluster/slurm/files/disable-sview.patch
@@ -0,0 +1,76 @@
+--- a/configure.ac 2019-08-13 20:40:08.000000000 +0200
++++ b/configure.ac 2019-08-22 12:02:02.127865098 +0200
+@@ -229,42 +229,6 @@
+ 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"])
+
+ X_AC_CRAY
+@@ -447,7 +411,6 @@
+ 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 -Naur slurm-19.05.2.orig/src/Makefile.am slurm-19.05.2/src/Makefile.am
+--- slurm-19.05.2.orig/src/Makefile.am 2019-08-13 20:40:08.000000000 +0200
++++ slurm-19.05.2/src/Makefile.am 2019-08-22 12:02:02.127865098 +0200
+@@ -25,5 +25,4 @@
+ srun \
+ sshare \
+ sstat \
+- strigger \
+- sview
++ strigger
+diff -Naur slurm-19.05.2.orig/src/Makefile.in slurm-19.05.2/src/Makefile.in
+--- slurm-19.05.2.orig/src/Makefile.in 2019-08-13 20:40:08.000000000 +0200
++++ slurm-19.05.2/src/Makefile.in 2019-08-22 12:02:02.127865098 +0200
+@@ -495,8 +495,7 @@
+ srun \
+ sshare \
+ sstat \
+- strigger \
+- sview
++ strigger
+
+ all: all-recursive
+
diff --git a/sys-cluster/slurm/slurm-19.05.4.1.ebuild
b/sys-cluster/slurm/slurm-19.05.4.1.ebuild
index b2750515b35..6cadf68379e 100644
--- a/sys-cluster/slurm/slurm-19.05.4.1.ebuild
+++ b/sys-cluster/slurm/slurm-19.05.4.1.ebuild
@@ -81,6 +81,8 @@ src_unpack() {
src_prepare() {
tc-ld-disable-gold
+ eapply "${FILESDIR}"/disable-sview.patch
+ eautoreconf
default
# pids should go to /var/run/slurm
