From c521d16be5337c02b390323dbfc3eaad40cc250b Mon Sep 17 00:00:00 2001
From: Tim Wickberg <tim@schedmd.com>
Date: Thu, 31 Jan 2019 15:11:32 -0700
Subject: [PATCH] Remove BlueGene and Cray ALPS from deprecated list.
Run autogen.sh, which picked up one older uncommited change to
a comment line in contribs/perlapi/libslurmdb/Makefile.in.
---
auxdir/x_ac_deprecated.m4 | 6 +-----
configure | 6 +-----
contribs/perlapi/libslurmdb/Makefile.in | 2 +-
3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/auxdir/x_ac_deprecated.m4 b/auxdir/x_ac_deprecated.m4
index 10ad1c28265..c46cef79195 100644
--- a/auxdir/x_ac_deprecated.m4
+++ b/auxdir/x_ac_deprecated.m4
@@ -27,11 +27,7 @@ AC_DEFUN([X_AC_DEPRECATED], [
AC_MSG_RESULT([${x_ac_deprecated=no}])
if test "$x_ac_deprecated" = no; then
- if test "$ac_bluegene_loaded" = yes; then
- AC_MSG_ERROR([BlueGene support is deprecated and will be removed in a future release. SchedMD customers are encouraged to contact support to discuss further. Use --enable-deprecated to build.])
- elif test "$ac_have_alps_cray" = yes; then
- AC_MSG_ERROR([Cray/ALPS support is deprecated and will be removed in a future release. Please consider using Native Cray mode. SchedMD customers are encouraged to contact support to discuss further. Use --enable-deprecated to build.])
- elif test "$ac_have_blcr" = yes; then
+ if test "$ac_have_blcr" = yes; then
AC_MSG_ERROR([BLCR support is deprecated and will be removed in a future release. SchedMD customers are encouraged to contact support to discuss further. Use --enable-deprecated to build.])
fi
fi
diff --git a/configure b/configure
index 1f2e7ae37e5..12cb39a728b 100755
--- a/configure
+++ b/configure
@@ -24773,11 +24773,7 @@ fi
$as_echo "${x_ac_deprecated=no}" >&6; }
if test "$x_ac_deprecated" = no; then
- if test "$ac_bluegene_loaded" = yes; then
- as_fn_error $? "BlueGene support is deprecated and will be removed in a future release. SchedMD customers are encouraged to contact support to discuss further. Use --enable-deprecated to build." "$LINENO" 5
- elif test "$ac_have_alps_cray" = yes; then
- as_fn_error $? "Cray/ALPS support is deprecated and will be removed in a future release. Please consider using Native Cray mode. SchedMD customers are encouraged to contact support to discuss further. Use --enable-deprecated to build." "$LINENO" 5
- elif test "$ac_have_blcr" = yes; then
+ if test "$ac_have_blcr" = yes; then
as_fn_error $? "BLCR support is deprecated and will be removed in a future release. SchedMD customers are encouraged to contact support to discuss further. Use --enable-deprecated to build." "$LINENO" 5
fi
fi
diff --git a/contribs/perlapi/libslurmdb/Makefile.in b/contribs/perlapi/libslurmdb/Makefile.in
index 0b7532cbab7..798f047c363 100644
--- a/contribs/perlapi/libslurmdb/Makefile.in
+++ b/contribs/perlapi/libslurmdb/Makefile.in
@@ -658,7 +658,7 @@ $(perl_dir)/Makefile: $(perl_dir)/Makefile.PL
# may fail, as seen on BlueGene platforms.
# Other Linux implementations sems to work fine with the LD specified as below
#
-all-local: $(perl_dir)/Makefile #libslurmdb
+all-local: $(perl_dir)/Makefile #libslurm
@cd $(perl_dir) && \
if [ ! -f Makefile ]; then \
$(perlpath) Makefile.PL $(PERL_MM_PARAMS) prefix=${prefix} INSTALL_BASE= PERL_MM_OPT=; \
--
GitLab