Compare commits
No commits in common. 'c10-beta' and 'c8' have entirely different histories.
@ -1,3 +1,3 @@
|
||||
SOURCES/torque-6.1.3.tar.xz
|
||||
SOURCES/torque-4.2.10.tar.gz
|
||||
SOURCES/xpbs.png
|
||||
SOURCES/xpbsmon.png
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
173c6af0699e4863c1caa0ca327d65b3e87bc8db SOURCES/torque-6.1.3.tar.xz
|
||||
02819f2d0ed764ebe73ef4094027598326011f3c SOURCES/torque-4.2.10.tar.gz
|
||||
b8c9209803cf2513620aa1c645135d798092ea08 SOURCES/xpbs.png
|
||||
1cfd43ed4bd9be416764e016d6cea202c3021f35 SOURCES/xpbsmon.png
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,61 @@
|
||||
--- a/contrib/init.d/pbs_mom.in 2015-03-19 20:24:58.000000000 -0700
|
||||
+++ b/contrib/init.d/pbs_mom.in 2016-02-20 18:46:26.058196405 -0800
|
||||
@@ -13,11 +13,21 @@
|
||||
SBIN_PATH=@sbindir@
|
||||
PBS_DAEMON="$SBIN_PATH/pbs_mom"
|
||||
PBS_HOME=@PBS_HOME@
|
||||
+# this should be the integer port value
|
||||
+PBS_PORT=""
|
||||
|
||||
if [ -f /etc/sysconfig/pbs_mom ];then
|
||||
. /etc/sysconfig/pbs_mom
|
||||
fi
|
||||
|
||||
+if [ -z "$PBS_PORT" ]; then
|
||||
+ momctl_port_arg=""
|
||||
+ pbs_mom_port_arg=""
|
||||
+else
|
||||
+ momctl_port_arg="$PBS_PORT"
|
||||
+ pbs_mom_port_arg="-M $PBS_PORT"
|
||||
+fi
|
||||
+
|
||||
if [ -z "$previous" ];then
|
||||
# being run manually, don't disturb jobs
|
||||
args="$args -p"
|
||||
@@ -41,7 +51,7 @@
|
||||
fi
|
||||
retval=1
|
||||
while kill -0 $pid 2>/dev/null;do
|
||||
- $SBIN_PATH/momctl -s
|
||||
+ $SBIN_PATH/momctl -s $momctl_port_arg
|
||||
retval=$?
|
||||
sleep 1
|
||||
done
|
||||
@@ -58,7 +68,7 @@
|
||||
[ $RET -eq 0 ] && echo -n "pbs_mom already running" && success && echo && exit 0
|
||||
|
||||
# ulimit -c unlimited # Uncomment this to preserve core files
|
||||
- daemon $PBS_DAEMON $args -d $PBS_HOME
|
||||
+ daemon $PBS_DAEMON $args $pbs_mom_port_arg -d $PBS_HOME
|
||||
RET=$?
|
||||
touch /var/lock/subsys/pbs_mom
|
||||
echo
|
||||
--- a/contrib/init.d/pbs_sched.in 2016-02-20 18:48:08.593799420 -0800
|
||||
+++ b/contrib/init.d/pbs_sched.in 2016-02-20 18:48:54.455727300 -0800
|
||||
@@ -11,6 +11,7 @@
|
||||
PBS_DAEMON=@sbindir@/pbs_sched
|
||||
PBS_HOME=@PBS_HOME@
|
||||
export PBS_DAEMON PBS_HOME
|
||||
+PBS_ARGS=""
|
||||
|
||||
if [ -f /etc/sysconfig/pbs_sched ];then
|
||||
. /etc/sysconfig/pbs_sched
|
||||
@@ -24,7 +25,7 @@
|
||||
RET=$?
|
||||
[ $RET -eq 0 ] && echo -n "pbs_sched already running" && success && echo && exit 0
|
||||
|
||||
- daemon $PBS_DAEMON -d $PBS_HOME
|
||||
+ daemon $PBS_DAEMON -d $PBS_HOME $PBS_ARGS
|
||||
RET=$?
|
||||
[ $RET -eq 0 ] && touch /var/lock/subsys/pbs_sched
|
||||
echo
|
||||
@ -0,0 +1,29 @@
|
||||
From fb7c21c16423cecdbd8ac2429118305c26b82bb4 Mon Sep 17 00:00:00 2001
|
||||
From: Justin Bronder <jsbronder@gmail.com>
|
||||
Date: Sat, 1 Jun 2013 11:37:27 -0400
|
||||
Subject: [PATCH] Libnet: remove unused header
|
||||
|
||||
Do not include <rpc/rpc.h> as it is unused. While this is normally
|
||||
harmless, glibc is dropping support for rpc as of 2.14 [1] and ipv6 is
|
||||
only supported in ti-rpc.
|
||||
|
||||
This fixes building on distros that have not manually patched rpc
|
||||
support back into glibc.
|
||||
|
||||
1. http://sourceware.org/bugzilla/show_bug.cgi?id=12949
|
||||
---
|
||||
src/lib/Libnet/net_client.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/src/lib/Libnet/net_client.c b/src/lib/Libnet/net_client.c
|
||||
index d8e51312f8..04c3ba0d78 100644
|
||||
--- a/src/lib/Libnet/net_client.c
|
||||
+++ b/src/lib/Libnet/net_client.c
|
||||
@@ -80,7 +80,6 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
-#include <rpc/rpc.h>
|
||||
#include <netinet/in.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
@ -1,593 +0,0 @@
|
||||
diff -up torque/acinclude.m4.cleanup torque/acinclude.m4
|
||||
--- torque/acinclude.m4.cleanup 2021-01-28 16:14:17.000000000 -0500
|
||||
+++ torque/acinclude.m4 2021-04-13 14:14:09.320271814 -0400
|
||||
@@ -20,12 +20,14 @@ dnl
|
||||
AC_DEFUN([AC_DECL_H_ERRNO],
|
||||
[AC_CACHE_CHECK([for h_errno declaration in netdb.h],
|
||||
ac_cv_decl_h_errno,
|
||||
-[AC_TRY_COMPILE([#include <sys/types.h>
|
||||
+[AC_COMPILE_IFELSE({AC_LANG_SOURCE([[
|
||||
+#include <sys/types.h>
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#include <netdb.h>
|
||||
-], [int _ZzQ = (int)(h_errno + 1);],
|
||||
+int _ZzQ = (int)(h_errno + 1);
|
||||
+]]),
|
||||
ac_cv_decl_h_errno=yes, ac_cv_decl_h_errno=no)])
|
||||
if test $ac_cv_decl_h_errno = yes; then
|
||||
AC_DEFINE(H_ERRNO_DECLARED, 1,
|
||||
@@ -183,7 +185,7 @@ AC_CHECK_MEMBER(struct stat64.st_mode,
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>])
|
||||
|
||||
-AC_MSG_CHECKING([if largefile compiles (looking at you, OSX)])
|
||||
+AC_MSG_CHECKING([if largefile compiles])
|
||||
AC_COMPILE_IFELSE([AC_LANG_SOURCE([
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
diff -up torque/buildutils/ac_c_bigendian_cross.m4.cleanup torque/buildutils/ac_c_bigendian_cross.m4
|
||||
--- torque/buildutils/ac_c_bigendian_cross.m4.cleanup 2021-01-28 16:14:17.000000000 -0500
|
||||
+++ torque/buildutils/ac_c_bigendian_cross.m4 2021-04-13 14:14:09.320271814 -0400
|
||||
@@ -19,18 +19,18 @@ AC_DEFUN([AC_C_BIGENDIAN_CROSS],
|
||||
[AC_CACHE_CHECK(whether byte ordering is bigendian, ac_cv_c_bigendian,
|
||||
[ac_cv_c_bigendian=unknown
|
||||
# See if sys/param.h defines the BYTE_ORDER macro.
|
||||
-AC_TRY_COMPILE([#include <sys/types.h>
|
||||
-#include <sys/param.h>], [
|
||||
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
|
||||
+#include <sys/param.h>]], [[
|
||||
#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
|
||||
bogus endian macros
|
||||
-#endif], [# It does; now see whether it defined to BIG_ENDIAN or not.
|
||||
+#endif]])],[# It does; now see whether it defined to BIG_ENDIAN or not.
|
||||
AC_TRY_COMPILE([#include <sys/types.h>
|
||||
#include <sys/param.h>], [
|
||||
#if BYTE_ORDER != BIG_ENDIAN
|
||||
not big endian
|
||||
-#endif], ac_cv_c_bigendian=yes, ac_cv_c_bigendian=no)])
|
||||
+#endif], ac_cv_c_bigendian=yes, ac_cv_c_bigendian=no)],[])
|
||||
if test $ac_cv_c_bigendian = unknown; then
|
||||
-AC_TRY_RUN([main () {
|
||||
+AC_RUN_IFELSE([AC_LANG_SOURCE([[main () {
|
||||
/* Are we little or big endian? From Harbison&Steele. */
|
||||
union
|
||||
{
|
||||
@@ -39,8 +39,7 @@ AC_TRY_RUN([main () {
|
||||
} u;
|
||||
u.l = 1;
|
||||
exit (u.c[sizeof (long) - 1] == 1);
|
||||
-}], ac_cv_c_bigendian=no, ac_cv_c_bigendian=yes,
|
||||
-[ echo $ac_n "cross-compiling... " 2>&AC_FD_MSG ])
|
||||
+}]])],[ac_cv_c_bigendian=no],[ac_cv_c_bigendian=yes],[ echo $ac_n "cross-compiling... " 2>&AS_MESSAGE_FD ])
|
||||
fi])
|
||||
if test $ac_cv_c_bigendian = unknown; then
|
||||
AC_MSG_CHECKING(to probe for byte ordering)
|
||||
@@ -57,18 +56,18 @@ EOF
|
||||
] if test -f conftest.c ; then
|
||||
if ${CC-cc} -c conftest.c -o conftest.o && test -f conftest.o ; then
|
||||
if test `grep -l BIGenDianSyS conftest.o` ; then
|
||||
- echo $ac_n ' big endian probe OK, ' 1>&AC_FD_MSG
|
||||
+ echo $ac_n ' big endian probe OK, ' 1>&AS_MESSAGE_FD
|
||||
ac_cv_c_bigendian=yes
|
||||
fi
|
||||
if test `grep -l LiTTleEnDian conftest.o` ; then
|
||||
- echo $ac_n ' little endian probe OK, ' 1>&AC_FD_MSG
|
||||
+ echo $ac_n ' little endian probe OK, ' 1>&AS_MESSAGE_FD
|
||||
if test $ac_cv_c_bigendian = yes ; then
|
||||
ac_cv_c_bigendian=unknown;
|
||||
else
|
||||
ac_cv_c_bigendian=no
|
||||
fi
|
||||
fi
|
||||
- echo $ac_n 'guessing bigendian ... ' >&AC_FD_MSG
|
||||
+ echo $ac_n 'guessing bigendian ... ' >&AS_MESSAGE_FD
|
||||
fi
|
||||
fi
|
||||
AC_MSG_RESULT($ac_cv_c_bigendian)
|
||||
diff -up torque/buildutils/acx_pthread.m4.cleanup torque/buildutils/acx_pthread.m4
|
||||
--- torque/buildutils/acx_pthread.m4.cleanup 2021-01-28 16:14:17.000000000 -0500
|
||||
+++ torque/buildutils/acx_pthread.m4 2021-04-13 14:14:09.320271814 -0400
|
||||
@@ -56,7 +56,7 @@ dnl @license GPLWithACException
|
||||
AC_DEFUN([ACX_PTHREAD], [
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
AC_LANG_SAVE
|
||||
-AC_LANG_C
|
||||
+AC_LANG([C])
|
||||
acx_pthread_ok=no
|
||||
|
||||
# We used to check for pthread.h first, but this fails if pthread.h
|
||||
diff -up torque/buildutils/ax_cflags_gcc_option.m4.cleanup torque/buildutils/ax_cflags_gcc_option.m4
|
||||
--- torque/buildutils/ax_cflags_gcc_option.m4.cleanup 2021-01-28 16:14:17.000000000 -0500
|
||||
+++ torque/buildutils/ax_cflags_gcc_option.m4 2021-04-13 14:14:09.320271814 -0400
|
||||
@@ -87,15 +87,14 @@ AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_o
|
||||
AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
|
||||
VAR,[VAR="no, unknown"
|
||||
AC_LANG_SAVE
|
||||
- AC_LANG_C
|
||||
+ AC_LANG([C])
|
||||
ac_save_[]FLAGS="$[]FLAGS"
|
||||
for ac_arg dnl
|
||||
in "-pedantic -Werror % m4_ifval($2,$2,-option)" dnl GCC
|
||||
"-pedantic % m4_ifval($2,$2,-option) %% no, obsolete" dnl new GCC
|
||||
#
|
||||
do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
|
||||
- AC_TRY_COMPILE([],[return 0;],
|
||||
- [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break],[])
|
||||
done
|
||||
FLAGS="$ac_save_[]FLAGS"
|
||||
AC_LANG_RESTORE
|
||||
@@ -123,15 +122,14 @@ AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc
|
||||
AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
|
||||
VAR,[VAR="no, unknown"
|
||||
AC_LANG_SAVE
|
||||
- AC_LANG_CPLUSPLUS
|
||||
+ AC_LANG([C++])
|
||||
ac_save_[]FLAGS="$[]FLAGS"
|
||||
for ac_arg dnl
|
||||
in "-pedantic -Werror % m4_ifval($2,$2,-option)" dnl GCC
|
||||
"-pedantic % m4_ifval($2,$2,-option) %% no, obsolete" dnl new GCC
|
||||
#
|
||||
do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
|
||||
- AC_TRY_COMPILE([],[return 0;],
|
||||
- [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break],[])
|
||||
done
|
||||
FLAGS="$ac_save_[]FLAGS"
|
||||
AC_LANG_RESTORE
|
||||
@@ -158,15 +156,14 @@ AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_o
|
||||
AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
|
||||
VAR,[VAR="no, unknown"
|
||||
AC_LANG_SAVE
|
||||
- AC_LANG_C
|
||||
+ AC_LANG([C])
|
||||
ac_save_[]FLAGS="$[]FLAGS"
|
||||
for ac_arg dnl
|
||||
in "-pedantic -Werror % m4_ifval($1,$1,-option)" dnl GCC
|
||||
"-pedantic % m4_ifval($1,$1,-option) %% no, obsolete" dnl new GCC
|
||||
#
|
||||
do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
|
||||
- AC_TRY_COMPILE([],[return 0;],
|
||||
- [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break],[])
|
||||
done
|
||||
FLAGS="$ac_save_[]FLAGS"
|
||||
AC_LANG_RESTORE
|
||||
@@ -194,15 +191,14 @@ AS_VAR_PUSHDEF([VAR],[ac_cv_cxxflags_gcc
|
||||
AC_CACHE_CHECK([m4_ifval($2,$2,FLAGS) for gcc m4_ifval($1,$1,-option)],
|
||||
VAR,[VAR="no, unknown"
|
||||
AC_LANG_SAVE
|
||||
- AC_LANG_CPLUSPLUS
|
||||
+ AC_LANG([C++])
|
||||
ac_save_[]FLAGS="$[]FLAGS"
|
||||
for ac_arg dnl
|
||||
in "-pedantic -Werror % m4_ifval($1,$1,-option)" dnl GCC
|
||||
"-pedantic % m4_ifval($1,$1,-option) %% no, obsolete" dnl new GCC
|
||||
#
|
||||
do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
|
||||
- AC_TRY_COMPILE([],[return 0;],
|
||||
- [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break],[])
|
||||
done
|
||||
FLAGS="$ac_save_[]FLAGS"
|
||||
AC_LANG_RESTORE
|
||||
diff -up torque/buildutils/tac_tcltk.m4.cleanup torque/buildutils/tac_tcltk.m4
|
||||
--- torque/buildutils/tac_tcltk.m4.cleanup 2021-01-28 16:14:17.000000000 -0500
|
||||
+++ torque/buildutils/tac_tcltk.m4 2021-04-13 14:14:09.320271814 -0400
|
||||
@@ -215,7 +215,7 @@ fi
|
||||
|
||||
|
||||
AC_ARG_WITH(tclatrsep,
|
||||
- AC_HELP_STRING([--with-tclatrsep=CHAR],[set the Tcl attribute separator character
|
||||
+ AS_HELP_STRING([--with-tclatrsep=CHAR],[set the Tcl attribute separator character
|
||||
this will default to "." if unspecified]),
|
||||
[tcl_atrsep="${withval}"], [tcl_atrsep="."])
|
||||
if test "$TCL" = "1" ; then
|
||||
diff -up torque/buildutils/tcl.m4.cleanup torque/buildutils/tcl.m4
|
||||
--- torque/buildutils/tcl.m4.cleanup 2021-01-28 16:14:17.000000000 -0500
|
||||
+++ torque/buildutils/tcl.m4 2021-04-13 14:14:09.320271814 -0400
|
||||
@@ -44,7 +44,7 @@ AC_DEFUN([TEA_PATH_TCLCONFIG], [
|
||||
if test x"${no_tcl}" = x ; then
|
||||
# we reset no_tcl in case something fails here
|
||||
no_tcl=true
|
||||
- AC_ARG_WITH(tcl, AC_HELP_STRING([--with-tcl],[directory containing tcl configuration (tclConfig.sh)]), with_tclconfig=${withval})
|
||||
+ AC_ARG_WITH(tcl, AS_HELP_STRING([--with-tcl],[directory containing tcl configuration (tclConfig.sh)]), with_tclconfig=${withval})
|
||||
AC_MSG_CHECKING([for Tcl configuration])
|
||||
AC_CACHE_VAL(ac_cv_c_tclconfig,[
|
||||
|
||||
@@ -141,7 +141,7 @@ AC_DEFUN([TEA_PATH_TKCONFIG], [
|
||||
if test x"${no_tk}" = x ; then
|
||||
# we reset no_tk in case something fails here
|
||||
no_tk=true
|
||||
- AC_ARG_WITH(tk, AC_HELP_STRING([--with-tk],[directory containing tk configuration (tkConfig.sh)]), with_tkconfig=${withval})
|
||||
+ AC_ARG_WITH(tk, AS_HELP_STRING([--with-tk],[directory containing tk configuration (tkConfig.sh)]), with_tkconfig=${withval})
|
||||
AC_MSG_CHECKING([for Tk configuration])
|
||||
AC_CACHE_VAL(ac_cv_c_tkconfig,[
|
||||
|
||||
@@ -440,7 +440,7 @@ AC_DEFUN([TEA_ENABLE_THREADS], [
|
||||
# Check a little harder for __pthread_mutex_init in the
|
||||
# same library, as some systems hide it there until
|
||||
# pthread.h is defined. We could alternatively do an
|
||||
- # AC_TRY_COMPILE with pthread.h, but that will work with
|
||||
+ # AC_COMPILE_IFELSE with pthread.h, but that will work with
|
||||
# libpthread really doesn't exist, like AIX 4.2.
|
||||
# [Bug: 4359]
|
||||
AC_CHECK_LIB(pthread, __pthread_mutex_init,
|
||||
@@ -621,8 +621,10 @@ AC_DEFUN([TEA_ENABLE_LANGINFO], [
|
||||
fi
|
||||
AC_MSG_CHECKING([whether to use nl_langinfo])
|
||||
if test "$langinfo_ok" = "yes"; then
|
||||
- AC_TRY_COMPILE([#include <langinfo.h>],
|
||||
- [nl_langinfo(CODESET);],[langinfo_ok=yes],[langinfo_ok=no])
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
|
||||
+ #include <langinfo.h>
|
||||
+ nl_langinfo(CODESET);]]),
|
||||
+ langinfo_ok=yes , langinfo_ok=no])
|
||||
if test "$langinfo_ok" = "no"; then
|
||||
langinfo_ok="no (could not compile with nl_langinfo)";
|
||||
fi
|
||||
@@ -1626,7 +1628,8 @@ dnl AC_CHECK_TOOL(AR, ar, :)
|
||||
|
||||
if test "x$DL_OBJS" = "xtclLoadAout.o" ; then
|
||||
AC_MSG_CHECKING([sys/exec.h])
|
||||
- AC_TRY_COMPILE([#include <sys/exec.h>],[
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
|
||||
+ #include <sys/exec.h>
|
||||
struct exec foo;
|
||||
unsigned long seek;
|
||||
int flag;
|
||||
@@ -1637,13 +1640,14 @@ dnl AC_CHECK_TOOL(AR, ar, :)
|
||||
#endif
|
||||
flag = (foo.a_magic == OMAGIC);
|
||||
return foo.a_text + foo.a_data + foo.a_bss + foo.a_entry;
|
||||
- ], tcl_ok=usable, tcl_ok=unusable)
|
||||
+ ]]), tcl_ok=usable, tcl_ok=unusable])
|
||||
AC_MSG_RESULT([$tcl_ok])
|
||||
if test $tcl_ok = usable; then
|
||||
AC_DEFINE(USE_SYS_EXEC_H)
|
||||
else
|
||||
AC_MSG_CHECKING([a.out.h])
|
||||
- AC_TRY_COMPILE([#include <a.out.h>],[
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
|
||||
+ #include <a.out.h>
|
||||
struct exec foo;
|
||||
unsigned long seek;
|
||||
int flag;
|
||||
@@ -1654,13 +1658,14 @@ dnl AC_CHECK_TOOL(AR, ar, :)
|
||||
#endif
|
||||
flag = (foo.a_magic == OMAGIC);
|
||||
return foo.a_text + foo.a_data + foo.a_bss + foo.a_entry;
|
||||
- ], tcl_ok=usable, tcl_ok=unusable)
|
||||
+ ]]), tcl_ok=usable, tcl_ok=unusable])
|
||||
AC_MSG_RESULT([$tcl_ok])
|
||||
if test $tcl_ok = usable; then
|
||||
AC_DEFINE(USE_A_OUT_H)
|
||||
else
|
||||
AC_MSG_CHECKING([sys/exec_aout.h])
|
||||
- AC_TRY_COMPILE([#include <sys/exec_aout.h>],[
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
|
||||
+ #include <sys/exec_aout.h>
|
||||
struct exec foo;
|
||||
unsigned long seek;
|
||||
int flag;
|
||||
@@ -1671,7 +1676,7 @@ dnl AC_CHECK_TOOL(AR, ar, :)
|
||||
#endif
|
||||
flag = (foo.a_midmag == OMAGIC);
|
||||
return foo.a_text + foo.a_data + foo.a_bss + foo.a_entry;
|
||||
- ], tcl_ok=usable, tcl_ok=unusable)
|
||||
+ ]]), tcl_ok=usable, tcl_ok=unusable])
|
||||
AC_MSG_RESULT([$tcl_ok])
|
||||
if test $tcl_ok = usable; then
|
||||
AC_DEFINE(USE_SYS_EXEC_AOUT_H)
|
||||
@@ -1913,7 +1918,7 @@ int main() {
|
||||
|
||||
AC_DEFUN([TEA_MISSING_POSIX_HEADERS], [
|
||||
AC_MSG_CHECKING([dirent.h])
|
||||
- AC_TRY_LINK([#include <sys/types.h>
|
||||
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
|
||||
#include <dirent.h>], [
|
||||
#ifndef _POSIX_SOURCE
|
||||
# ifdef __Lynx__
|
||||
@@ -1932,7 +1937,7 @@ d = opendir("foobar");
|
||||
entryPtr = readdir(d);
|
||||
p = entryPtr->d_name;
|
||||
closedir(d);
|
||||
-], tcl_ok=yes, tcl_ok=no)
|
||||
+]])], [tcl_ok=yes], [tcl_ok=no])
|
||||
|
||||
if test $tcl_ok = no; then
|
||||
AC_DEFINE(NO_DIRENT_H)
|
||||
@@ -2165,8 +2170,8 @@ AC_DEFUN([TEA_TIME_HANDLER], [
|
||||
|
||||
AC_MSG_CHECKING([tm_tzadj in struct tm])
|
||||
AC_CACHE_VAL(tcl_cv_member_tm_tzadj,
|
||||
- AC_TRY_COMPILE([#include <time.h>], [struct tm tm; tm.tm_tzadj;],
|
||||
- tcl_cv_member_tm_tzadj=yes, tcl_cv_member_tm_tzadj=no))
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <time.h>], [struct tm tm; tm.tm_tzadj;]]),
|
||||
+ tcl_cv_member_tm_tzadj=yes, tcl_cv_member_tm_tzadj=no]))
|
||||
AC_MSG_RESULT([$tcl_cv_member_tm_tzadj])
|
||||
if test $tcl_cv_member_tm_tzadj = yes ; then
|
||||
AC_DEFINE(HAVE_TM_TZADJ)
|
||||
@@ -2174,8 +2179,8 @@ AC_DEFUN([TEA_TIME_HANDLER], [
|
||||
|
||||
AC_MSG_CHECKING([tm_gmtoff in struct tm])
|
||||
AC_CACHE_VAL(tcl_cv_member_tm_gmtoff,
|
||||
- AC_TRY_COMPILE([#include <time.h>], [struct tm tm; tm.tm_gmtoff;],
|
||||
- tcl_cv_member_tm_gmtoff=yes, tcl_cv_member_tm_gmtoff=no))
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <time.h>], [struct tm tm; tm.tm_gmtoff;]]),
|
||||
+ tcl_cv_member_tm_gmtoff=yes, tcl_cv_member_tm_gmtoff=no]))
|
||||
AC_MSG_RESULT([$tcl_cv_member_tm_gmtoff])
|
||||
if test $tcl_cv_member_tm_gmtoff = yes ; then
|
||||
AC_DEFINE(HAVE_TM_GMTOFF)
|
||||
@@ -2187,11 +2192,11 @@ AC_DEFUN([TEA_TIME_HANDLER], [
|
||||
#
|
||||
AC_MSG_CHECKING([long timezone variable])
|
||||
AC_CACHE_VAL(tcl_cv_var_timezone,
|
||||
- AC_TRY_COMPILE([#include <time.h>],
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <time.h>],
|
||||
[extern long timezone;
|
||||
timezone += 1;
|
||||
- exit (0);],
|
||||
- tcl_cv_timezone_long=yes, tcl_cv_timezone_long=no))
|
||||
+ exit (0);]]),
|
||||
+ tcl_cv_timezone_long=yes, tcl_cv_timezone_long=no]))
|
||||
AC_MSG_RESULT([$tcl_cv_timezone_long])
|
||||
if test $tcl_cv_timezone_long = yes ; then
|
||||
AC_DEFINE(HAVE_TIMEZONE_VAR)
|
||||
@@ -2201,11 +2206,11 @@ AC_DEFUN([TEA_TIME_HANDLER], [
|
||||
#
|
||||
AC_MSG_CHECKING([time_t timezone variable])
|
||||
AC_CACHE_VAL(tcl_cv_timezone_time,
|
||||
- AC_TRY_COMPILE([#include <time.h>],
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <time.h>],
|
||||
[extern time_t timezone;
|
||||
timezone += 1;
|
||||
- exit (0);],
|
||||
- tcl_cv_timezone_time=yes, tcl_cv_timezone_time=no))
|
||||
+ exit (0);]]),
|
||||
+ tcl_cv_timezone_time=yes, tcl_cv_timezone_time=no]))
|
||||
AC_MSG_RESULT([$tcl_cv_timezone_time])
|
||||
if test $tcl_cv_timezone_time = yes ; then
|
||||
AC_DEFINE(HAVE_TIMEZONE_VAR)
|
||||
@@ -2372,8 +2377,7 @@ AC_DEFUN([TEA_TCL_LINK_LIBS], [
|
||||
AC_DEFUN([TEA_TCL_EARLY_FLAG],[
|
||||
AC_CACHE_VAL([tcl_cv_flag_]translit($1,[A-Z],[a-z]),
|
||||
AC_TRY_COMPILE([$2], $3, [tcl_cv_flag_]translit($1,[A-Z],[a-z])=no,
|
||||
- AC_TRY_COMPILE([[#define ]$1[ 1
|
||||
-]$2], $3,
|
||||
+ AC_TRY_COMPILE([[#define ]$1[ 1]$2], $3,
|
||||
[tcl_cv_flag_]translit($1,[A-Z],[a-z])=yes,
|
||||
[tcl_cv_flag_]translit($1,[A-Z],[a-z])=no)))
|
||||
if test ["x${tcl_cv_flag_]translit($1,[A-Z],[a-z])[}" = "xyes"] ; then
|
||||
@@ -2436,9 +2440,12 @@ AC_DEFUN([TEA_TCL_64BIT_FLAGS], [
|
||||
# Now check for auxiliary declarations
|
||||
AC_MSG_CHECKING([for struct dirent64])
|
||||
AC_CACHE_VAL(tcl_cv_struct_dirent64,[
|
||||
- AC_TRY_COMPILE([#include <sys/types.h>
|
||||
-#include <sys/dirent.h>],[struct dirent64 p;],
|
||||
- tcl_cv_struct_dirent64=yes,tcl_cv_struct_dirent64=no)])
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/dirent.h>
|
||||
+struct dirent64 p;
|
||||
+ ]]),
|
||||
+ tcl_cv_struct_dirent64=yes,tcl_cv_struct_dirent64=no])])
|
||||
if test "x${tcl_cv_struct_dirent64}" = "xyes" ; then
|
||||
AC_DEFINE(HAVE_STRUCT_DIRENT64)
|
||||
fi
|
||||
@@ -2446,9 +2453,11 @@ AC_DEFUN([TEA_TCL_64BIT_FLAGS], [
|
||||
|
||||
AC_MSG_CHECKING([for struct stat64])
|
||||
AC_CACHE_VAL(tcl_cv_struct_stat64,[
|
||||
- AC_TRY_COMPILE([#include <sys/stat.h>],[struct stat64 p;
|
||||
-],
|
||||
- tcl_cv_struct_stat64=yes,tcl_cv_struct_stat64=no)])
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
|
||||
+#include <sys/stat.h>
|
||||
+struct stat64 p;
|
||||
+ ]]),
|
||||
+ tcl_cv_struct_stat64=yes,tcl_cv_struct_stat64=no])])
|
||||
if test "x${tcl_cv_struct_stat64}" = "xyes" ; then
|
||||
AC_DEFINE(HAVE_STRUCT_STAT64)
|
||||
fi
|
||||
@@ -2456,9 +2465,11 @@ AC_DEFUN([TEA_TCL_64BIT_FLAGS], [
|
||||
|
||||
AC_MSG_CHECKING([for off64_t])
|
||||
AC_CACHE_VAL(tcl_cv_type_off64_t,[
|
||||
- AC_TRY_COMPILE([#include <sys/types.h>],[off64_t offset;
|
||||
-],
|
||||
- tcl_cv_type_off64_t=yes,tcl_cv_type_off64_t=no)])
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
|
||||
+#include <sys/types.h>
|
||||
+off64_t offset;
|
||||
+ ]])},
|
||||
+ tcl_cv_type_off64_t=yes,tcl_cv_type_off64_t=no])])
|
||||
if test "x${tcl_cv_type_off64_t}" = "xyes" ; then
|
||||
AC_DEFINE(HAVE_TYPE_OFF64_T)
|
||||
fi
|
||||
@@ -2898,7 +2909,7 @@ AC_DEFUN([TEA_PRIVATE_TCL_HEADERS], [
|
||||
AC_DEFUN([TEA_PUBLIC_TCL_HEADERS], [
|
||||
AC_MSG_CHECKING([for Tcl public headers])
|
||||
|
||||
- AC_ARG_WITH(tclinclude, AC_HELP_STRING([--with-tclinclude],[directory containing the public Tcl header files]), with_tclinclude=${withval})
|
||||
+ AC_ARG_WITH(tclinclude, AS_HELP_STRING([--with-tclinclude],[directory containing the public Tcl header files]), with_tclinclude=${withval})
|
||||
|
||||
AC_CACHE_VAL(ac_cv_c_tclh, [
|
||||
# Use the value from --with-tclinclude, if it was given
|
||||
@@ -3027,7 +3038,7 @@ AC_DEFUN([TEA_PRIVATE_TK_HEADERS], [
|
||||
AC_DEFUN([TEA_PUBLIC_TK_HEADERS], [
|
||||
AC_MSG_CHECKING([for Tk public headers])
|
||||
|
||||
- AC_ARG_WITH(tkinclude, AC_HELP_STRING([--with-tkinclude],[directory containing the public Tk header files.]), with_tkinclude=${withval})
|
||||
+ AC_ARG_WITH(tkinclude, AS_HELP_STRING([--with-tkinclude],[directory containing the public Tk header files.]), with_tkinclude=${withval})
|
||||
|
||||
AC_CACHE_VAL(ac_cv_c_tkh, [
|
||||
# Use the value from --with-tkinclude, if it was given
|
||||
@@ -3222,7 +3233,7 @@ AC_DEFUN([TEA_PATH_CONFIG], [
|
||||
if test x"${no_$1}" = x ; then
|
||||
# we reset no_$1 in case something fails here
|
||||
no_$1=true
|
||||
- AC_ARG_WITH($1, AC_HELP_STRING([--with-$1],[directory containing $1 configuration ($1Config.sh)]), with_$1config=${withval})
|
||||
+ AC_ARG_WITH($1, AS_HELP_STRING([--with-$1],[directory containing $1 configuration ($1Config.sh)]), with_$1config=${withval})
|
||||
AC_MSG_CHECKING([for $1 configuration])
|
||||
AC_CACHE_VAL(ac_cv_c_$1config,[
|
||||
|
||||
diff -up torque/configure.ac.cleanup torque/configure.ac
|
||||
--- torque/configure.ac.cleanup 2021-04-13 14:14:09.313271761 -0400
|
||||
+++ torque/configure.ac 2021-04-13 14:36:29.125464515 -0400
|
||||
@@ -32,14 +32,15 @@ dnl Updated to use m4
|
||||
dnl added library functionality to testing
|
||||
dnl by John Rosenquist (jrosenquist@adaptivecomputing.com)
|
||||
|
||||
-AC_PREREQ(2.53)
|
||||
-AC_INIT([torque], [6.1.3], [torqueusers@supercluster.org])
|
||||
+AC_PREREQ([2.69])
|
||||
+AC_INIT([torque],[6.1.3],[torqueusers@supercluster.org])
|
||||
AC_REVISION($Revision$)
|
||||
AC_CONFIG_SRCDIR([src/cmds/qrun.c])
|
||||
AC_CONFIG_AUX_DIR([buildutils])
|
||||
AC_CANONICAL_HOST
|
||||
AC_CONFIG_MACRO_DIR([buildutils])
|
||||
|
||||
+AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
m4_ifdef([AM_PROG_AR], [
|
||||
AM_PROG_AR
|
||||
@@ -58,7 +59,7 @@ m4_ifdef([HAVE_CHECK],
|
||||
[AM_INIT_AUTOMAKE([-Wall -Werror -Wno-unsupported foreign 1.9.6])])
|
||||
|
||||
AM_PROG_CC_C_O
|
||||
-CC="$CXX"
|
||||
+# CC="$CXX"
|
||||
CCLD="$CXX"
|
||||
AC_SUBST([CCLD])
|
||||
LIBTOOLFLAGS="--tag=CXX"
|
||||
@@ -82,7 +83,7 @@ gccwarnings=yes
|
||||
dnl Instead of putting a long list of defines on the command line
|
||||
dnl for each compile, use a file called "pbs_config.h" that will
|
||||
dnl be created in the include directory.
|
||||
-AM_CONFIG_HEADER([src/include/pbs_config.h])
|
||||
+AC_CONFIG_HEADERS([src/include/pbs_config.h])
|
||||
|
||||
dnl
|
||||
dnl Find our git revision hash for program outputs
|
||||
@@ -672,14 +673,14 @@ dnl
|
||||
AC_CHECK_PROGS(AR,ar,exit)
|
||||
|
||||
dnl wrapped libtool macro to remove annoying warning message
|
||||
-AC_PROG_LIBTOOL
|
||||
-TAC_PROG_LIBTOOL_PATCH
|
||||
+# LT_INIT
|
||||
+# TAC_PROG_LIBTOOL_PATCH
|
||||
|
||||
AC_PROG_LN_S
|
||||
|
||||
|
||||
dnl needed for scheduler.basl
|
||||
-AM_PROG_LEX
|
||||
+AC_PROG_LEX(noyywrap)
|
||||
AC_PROG_YACC
|
||||
|
||||
|
||||
@@ -723,7 +724,7 @@ dnl and TAC_SYS_LARGEFILE
|
||||
dnl
|
||||
AC_MSG_CHECKING([whether to compile with debugging symbols])
|
||||
AC_ARG_WITH([debug],
|
||||
- AC_HELP_STRING([--with-debug], [compile with debugging symbols]),
|
||||
+ AS_HELP_STRING([--with-debug],[compile with debugging symbols]),
|
||||
DEBUG_SYMBOLS=$withval, DEBUG_SYMBOLS="yes")
|
||||
AC_MSG_RESULT([DEBUG_SYMBOLS=$DEBUG_SYMBOLS])
|
||||
dnl remove -O* and add -g
|
||||
@@ -795,7 +796,8 @@ LIBS="$LIBS $PTHREAD_LIBS"
|
||||
dnl
|
||||
dnl we need libxml2
|
||||
dnl
|
||||
-xmlLib=`xml2-config --libs | sed 's/-L@<:@^@<:@:space:@:>@@:>@* //g;s/-l//'`
|
||||
+xmlLib=xml2
|
||||
+# `xml2-config --libs | sed 's/-L@<:@^@<:@:space:@:>@@:>@* //g;s/-l//'`
|
||||
|
||||
dnl skip the first two chars because its -l<libname>
|
||||
AC_CHECK_LIB(${xmlLib}, xmlGetProp,
|
||||
@@ -804,9 +806,10 @@ AC_CHECK_LIB(${xmlLib}, xmlGetProp,
|
||||
|
||||
|
||||
dnl find zlib
|
||||
-AC_CHECK_LIB(z, gzopen,
|
||||
- [],
|
||||
- [AC_MSG_ERROR([TORQUE needs zlib-devel in order to build]) ])
|
||||
+AC_CHECK_LIB(z, gzopen,[LIBS="$LIBS -lz"], [AC_MSG_ERROR(could not find zlib)])
|
||||
+# AC_CHECK_LIB(z, gzopen,
|
||||
+# [],
|
||||
+# [AC_MSG_ERROR([TORQUE needs zlib-devel in order to build]) ])
|
||||
|
||||
|
||||
dnl ###########################################
|
||||
@@ -858,6 +861,7 @@ dnl
|
||||
|
||||
AC_HEADER_DIRENT
|
||||
AC_HEADER_STDC
|
||||
+
|
||||
AC_HEADER_SYS_WAIT
|
||||
|
||||
AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h limits.h malloc.h netdb.h \
|
||||
@@ -1368,8 +1372,7 @@ dnl Add the ability to link against the
|
||||
dnl
|
||||
dnl --with-pmix
|
||||
AC_ARG_WITH([pmix],
|
||||
- [AC_HELP_STRING([--with-pmix(=DIR)],
|
||||
- [Build PMIx support. DIR can either be left off, or be a valid directory name. Supplying a valid directory name adds DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
|
||||
+ [AS_HELP_STRING([--with-pmix(=DIR)],[Build PMIx support. DIR can either be left off, or be a valid directory name. Supplying a valid directory name adds DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
|
||||
|
||||
AC_MSG_CHECKING([if user requested PMIx support($with_pmix)])
|
||||
AS_IF([test -z "$with_pmix" || test "$with_pmix" = "no"],
|
||||
@@ -2421,7 +2424,7 @@ dnl modulefiles
|
||||
AC_MSG_CHECKING([whether to install modulefiles])
|
||||
|
||||
AC_ARG_WITH(modulefiles,
|
||||
- AC_HELP_STRING([--with-modulefiles@<:@=DIR@:>@], [use modulefiles in specified directory [[/etc/modulefiles]]]),
|
||||
+ AS_HELP_STRING([--with-modulefiles@<:@=DIR@:>@],[use modulefiles in specified directory [[/etc/modulefiles]]]),
|
||||
[], [with_modulefiles="no"])
|
||||
if test "$with_modulefiles" != 'no'; then
|
||||
if test "$with_modulefiles" = 'yes'; then
|
||||
@@ -2530,7 +2533,7 @@ fi
|
||||
AC_CHECK_FUNC(ntohl, [ :],
|
||||
AC_MSG_CHECKING([for ntohl in arpa/inet.h])
|
||||
torque_cv_ntohl_needs_arpa_inet_h="no"
|
||||
- AC_TRY_COMPILE([
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||
#ifdef HAVE_SYS_TYPES_H
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
@@ -2540,9 +2543,8 @@ AC_CHECK_FUNC(ntohl, [ :],
|
||||
#ifdef HAVE_ARPA_INET_H
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
- ],[exit(ntohl(0));],
|
||||
- [torque_cv_ntohl_needs_arpa_inet_h="yes"
|
||||
- AC_DEFINE_UNQUOTED([NTOHL_NEEDS_ARPA_INET_H],1,[Define if ntohl() is declared in arpa/inet.h])])
|
||||
+ ]], [[exit(ntohl(0));]])],[torque_cv_ntohl_needs_arpa_inet_h="yes"
|
||||
+ AC_DEFINE_UNQUOTED([NTOHL_NEEDS_ARPA_INET_H],1,[Define if ntohl() is declared in arpa/inet.h])],[])
|
||||
AC_MSG_RESULT($torque_cv_ntohl_needs_arpa_inet_h)
|
||||
)
|
||||
|
||||
@@ -2672,7 +2674,7 @@ AC_DEFINE_UNQUOTED([PBS_CFLAGS],"${CFLAG
|
||||
|
||||
AC_CONFIG_FILES([torque.spec:buildutils/torque.spec.in])
|
||||
#The output files are alphabetically ordered by src then check test files
|
||||
-AC_OUTPUT(buildutils/pbs_mkdirs
|
||||
+AC_CONFIG_FILES([buildutils/pbs_mkdirs
|
||||
buildutils/self-extract-head-sh
|
||||
buildutils/modulefiles
|
||||
buildutils/modulefiles.vers
|
||||
@@ -2727,7 +2729,8 @@ AC_OUTPUT(buildutils/pbs_mkdirs
|
||||
src/drmaa/Doxyfile
|
||||
src/pam/Makefile
|
||||
|
||||
-)
|
||||
+])
|
||||
+AC_OUTPUT
|
||||
|
||||
echo
|
||||
echo "Building components: server=$build_server mom=$build_mom clients=$build_clients
|
||||
@ -1,33 +0,0 @@
|
||||
diff -up torque/src/drmaa/src/compat.h.bool-fix torque/src/drmaa/src/compat.h
|
||||
--- torque/src/drmaa/src/compat.h.bool-fix 2021-01-28 17:59:06.149190046 -0500
|
||||
+++ torque/src/drmaa/src/compat.h 2021-01-28 17:59:16.941243507 -0500
|
||||
@@ -51,6 +51,7 @@ int asprintf(char **strp, const char *fm
|
||||
int vasprintf(char **strp, const char *fmt, va_list ap);
|
||||
#endif
|
||||
|
||||
+/*
|
||||
#ifndef HAVE_STDBOOL_H
|
||||
# ifndef bool
|
||||
# define bool int
|
||||
@@ -62,6 +63,7 @@ int vasprintf(char **strp, const char *f
|
||||
# define false 0
|
||||
# endif
|
||||
#endif
|
||||
+*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
diff -up torque/src/include/pbs_ifl.h.bool-fix torque/src/include/pbs_ifl.h
|
||||
--- torque/src/include/pbs_ifl.h.bool-fix 2021-01-28 16:14:24.000000000 -0500
|
||||
+++ torque/src/include/pbs_ifl.h 2021-01-28 17:50:17.068569045 -0500
|
||||
@@ -87,6 +87,10 @@
|
||||
#define _PBS_IFL_DEF
|
||||
#include <sys/socket.h>
|
||||
|
||||
+#ifdef __cplusplus
|
||||
+#include <stdbool.h>
|
||||
+#endif /* __cplusplus */
|
||||
+
|
||||
/* Attribute Names used by user commands */
|
||||
|
||||
#define ATTR_a "Execution_Time"
|
||||
@ -1,46 +0,0 @@
|
||||
diff -up torque/contrib/init.d/pbs_mom.in.port-args torque/contrib/init.d/pbs_mom.in
|
||||
--- torque/contrib/init.d/pbs_mom.in.port-args 2021-01-28 16:29:53.554947436 -0500
|
||||
+++ torque/contrib/init.d/pbs_mom.in 2021-01-28 16:33:43.410074859 -0500
|
||||
@@ -25,6 +25,8 @@ SBIN_PATH=@sbindir@
|
||||
PBS_DAEMON="$SBIN_PATH/pbs_mom"
|
||||
PBS_HOME=@PBS_HOME@
|
||||
PBS_ARGS=""
|
||||
+# this should be the integer port value
|
||||
+PBS_PORT=""
|
||||
|
||||
SUBSYS_LOCK="/var/lock/subsys/pbs_mom"
|
||||
|
||||
@@ -32,6 +34,14 @@ if [ -f /etc/sysconfig/pbs_mom ];then
|
||||
. /etc/sysconfig/pbs_mom
|
||||
fi
|
||||
|
||||
+if [ -z "$PBS_PORT" ]; then
|
||||
+ momctl_port_arg=""
|
||||
+ pbs_mom_port_arg=""
|
||||
+else
|
||||
+ momctl_port_arg="$PBS_PORT"
|
||||
+ pbs_mom_port_arg="-M $PBS_PORT"
|
||||
+fi
|
||||
+
|
||||
MOM_LOCK="$PBS_HOME/mom_priv/mom.lock"
|
||||
|
||||
if [ -z "$previous" ];then
|
||||
@@ -84,7 +94,7 @@ kill_pbs_mom() {
|
||||
retval=1
|
||||
for i in {1..5}; do
|
||||
kill -0 $pid &>/dev/null || return 0
|
||||
- $SBIN_PATH/momctl -s && return $?
|
||||
+ $SBIN_PATH/momctl -s $momctl_port_arg && return $?
|
||||
sleep 1
|
||||
done
|
||||
return $retval
|
||||
@@ -110,7 +120,7 @@ case "$1" in
|
||||
fi
|
||||
|
||||
# ulimit -c unlimited # Uncomment this to preserve core files
|
||||
- daemon $PBS_DAEMON $args -d $PBS_HOME $PBS_ARGS
|
||||
+ daemon $PBS_DAEMON $args $pbs_mom_port_arg -d $PBS_HOME $PBS_ARGS
|
||||
RET=$?
|
||||
touch $SUBSYS_LOCK
|
||||
echo
|
||||
diff -up torque/contrib/init.d/pbs_sched.in.port-args torque/contrib/init.d/pbs_sched.in
|
||||
@ -1,318 +0,0 @@
|
||||
diff -up torque/configure.ac.system-jsoncpp torque/configure.ac
|
||||
--- torque/configure.ac.system-jsoncpp 2021-01-28 17:33:44.008649547 -0500
|
||||
+++ torque/configure.ac 2021-01-28 17:37:26.446751483 -0500
|
||||
@@ -1311,6 +1311,13 @@ if test "x$HWLOC_CFLAGS" != "xnone"; the
|
||||
fi
|
||||
|
||||
|
||||
+PKG_CHECK_MODULES([JSONCPP], [jsoncpp],
|
||||
+ [ CFLAGS="$CFLAGS $JSONCPP_CFLAGS"; CPPFLAGS="$CPPFLAGS $JSONCPP_CFLAGS"; ],
|
||||
+ [ AC_MSG_ERROR([$JSONCPP_PKG_ERRORS])])
|
||||
+
|
||||
+LIBS="$LIBS $JSONCPP_LIBS";
|
||||
+
|
||||
+
|
||||
dnl enable pbs_mom to use the cpuset API from libcpuset
|
||||
dnl only makes sense with cpusets enabled
|
||||
AC_ARG_ENABLE(libcpuset, [ --enable-libcpuset Allows pbs_mom to use the cpuset API from libcpuset])
|
||||
diff -up torque/src/include/machine.hpp.system-jsoncpp torque/src/include/machine.hpp
|
||||
--- torque/src/include/machine.hpp.system-jsoncpp 2021-01-28 17:15:46.295362401 -0500
|
||||
+++ torque/src/include/machine.hpp 2021-01-28 17:15:58.310420979 -0500
|
||||
@@ -14,7 +14,7 @@
|
||||
#include "pbs_job.h"
|
||||
#include "req.hpp"
|
||||
#include "allocation.hpp"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
extern const int ALL_TASKS;
|
||||
|
||||
|
||||
diff -up torque/src/include/Makefile.am.system-jsoncpp torque/src/include/Makefile.am
|
||||
--- torque/src/include/Makefile.am.system-jsoncpp 2021-01-28 17:15:10.067185774 -0500
|
||||
+++ torque/src/include/Makefile.am 2021-01-28 17:15:22.285245341 -0500
|
||||
@@ -27,8 +27,8 @@ noinst_HEADERS = acct.h array.h assertio
|
||||
job_usage_info.hpp machine.hpp req.hpp complete_req.hpp trq_cgroups.h \
|
||||
job_recovery.h allocation.hpp attr_req_info.hpp acl_special.hpp restricted_host.hpp \
|
||||
pbs_helper.h mail_throttler.hpp lib_ifl.h runjob_help.hpp pmix_tracker.hpp \
|
||||
- pmix_operation.hpp job_host_data.hpp policy_values.h plugin_internal.h json/json.h \
|
||||
- json/json-forwards.h authorized_hosts.hpp numa_constants.h
|
||||
+ pmix_operation.hpp job_host_data.hpp policy_values.h plugin_internal.h \
|
||||
+ authorized_hosts.hpp numa_constants.h
|
||||
|
||||
BUILT_SOURCES = site_job_attr_def.h site_job_attr_enum.h \
|
||||
site_qmgr_node_print.h site_qmgr_que_print.h \
|
||||
diff -up torque/src/include/pbs_job.h.system-jsoncpp torque/src/include/pbs_job.h
|
||||
--- torque/src/include/pbs_job.h.system-jsoncpp 2021-01-28 17:16:09.054473361 -0500
|
||||
+++ torque/src/include/pbs_job.h 2021-01-28 17:18:26.715144482 -0500
|
||||
@@ -104,7 +104,7 @@
|
||||
#include "tcp.h" /* tcp_chan */
|
||||
#include "net_connect.h"
|
||||
#include "job_host_data.hpp"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
|
||||
|
||||
#define SAVEJOB_BUF_SIZE 8192
|
||||
diff -up torque/src/lib/Libutils/Makefile.am.system-jsoncpp torque/src/lib/Libutils/Makefile.am
|
||||
--- torque/src/lib/Libutils/Makefile.am.system-jsoncpp 2021-01-28 17:19:31.650461068 -0500
|
||||
+++ torque/src/lib/Libutils/Makefile.am 2021-01-28 17:19:42.934516083 -0500
|
||||
@@ -10,6 +10,6 @@ noinst_LIBRARIES = libutils.a
|
||||
libutils_a_SOURCES = u_groups.c u_tree.c u_mu.c u_MXML.c u_xml.c u_threadpool.c u_lock_ctl.c \
|
||||
u_mom_hierarchy.c u_hash_map_structs.c u_users.c u_constants.c u_mutex_mgr.cpp \
|
||||
u_misc.c u_putenv.c u_wrapper.c u_timer.cpp machine.cpp numa_chip.cpp \
|
||||
- numa_core.cpp numa_pci_device.cpp numa_socket.cpp allocation.cpp jsoncpp.cpp \
|
||||
+ numa_core.cpp numa_pci_device.cpp numa_socket.cpp allocation.cpp \
|
||||
authorized_hosts.cpp numa_constants.cpp
|
||||
|
||||
diff -up torque/src/resmom/catch_child.c.system-jsoncpp torque/src/resmom/catch_child.c
|
||||
--- torque/src/resmom/catch_child.c.system-jsoncpp 2021-01-28 17:20:20.852700949 -0500
|
||||
+++ torque/src/resmom/catch_child.c 2021-01-28 17:20:32.701758691 -0500
|
||||
@@ -51,7 +51,7 @@
|
||||
#include "pbs_cpuset.h"
|
||||
#endif
|
||||
#include "mom_config.h"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
|
||||
#define DIS_REPLY_READ_RETRY 10
|
||||
|
||||
diff -up torque/src/resmom/mom_server.c.system-jsoncpp torque/src/resmom/mom_server.c
|
||||
--- torque/src/resmom/mom_server.c.system-jsoncpp 2021-01-28 17:20:47.497830825 -0500
|
||||
+++ torque/src/resmom/mom_server.c 2021-01-28 17:21:04.386913166 -0500
|
||||
@@ -251,7 +251,7 @@
|
||||
#include "machine.hpp"
|
||||
#endif
|
||||
#ifdef USE_RESOURCE_PLUGIN
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
#include "trq_plugin_api.h"
|
||||
#include "plugin_internal.h"
|
||||
#endif
|
||||
diff -up torque/src/resmom/parse_config.c.system-jsoncpp torque/src/resmom/parse_config.c
|
||||
--- torque/src/resmom/parse_config.c.system-jsoncpp 2021-01-28 17:21:14.600962963 -0500
|
||||
+++ torque/src/resmom/parse_config.c 2021-01-28 17:21:26.865022756 -0500
|
||||
@@ -99,7 +99,7 @@
|
||||
#include "mom_func.h"
|
||||
#include "authorized_hosts.hpp"
|
||||
#include "csv.h"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
#include "req.hpp"
|
||||
|
||||
void encode_used(job *pjob, int perm, Json::Value *, tlist_head *phead);
|
||||
diff -up torque/src/resmom/prolog.c.system-jsoncpp torque/src/resmom/prolog.c
|
||||
--- torque/src/resmom/prolog.c.system-jsoncpp 2021-01-28 17:21:37.352073884 -0500
|
||||
+++ torque/src/resmom/prolog.c 2021-01-28 17:21:49.191131604 -0500
|
||||
@@ -108,7 +108,7 @@
|
||||
#include "net_connect.h"
|
||||
#include "utils.h"
|
||||
#include "mom_config.h"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
|
||||
|
||||
const int PELOG_DOESNT_EXIST = -1;
|
||||
diff -up torque/src/resmom/requests.c.system-jsoncpp torque/src/resmom/requests.c
|
||||
--- torque/src/resmom/requests.c.system-jsoncpp 2021-01-28 17:22:05.545211337 -0500
|
||||
+++ torque/src/resmom/requests.c 2021-01-28 17:22:16.108262836 -0500
|
||||
@@ -123,7 +123,7 @@
|
||||
#include "power_state.hpp"
|
||||
#ifdef USE_RESOURCE_PLUGIN
|
||||
#include "plugin_internal.h"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
#endif
|
||||
|
||||
#ifdef _CRAY
|
||||
diff -up torque/src/server/job.cpp.system-jsoncpp torque/src/server/job.cpp
|
||||
--- torque/src/server/job.cpp.system-jsoncpp 2021-01-28 17:22:46.476410893 -0500
|
||||
+++ torque/src/server/job.cpp 2021-01-28 17:22:57.246463402 -0500
|
||||
@@ -1,7 +1,7 @@
|
||||
#include <pbs_config.h>
|
||||
#include "pbs_job.h"
|
||||
#include "log.h"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
|
||||
|
||||
/**
|
||||
diff -up torque/src/server/node_manager.c.system-jsoncpp torque/src/server/node_manager.c
|
||||
--- torque/src/server/node_manager.c.system-jsoncpp 2021-01-28 17:24:40.798968223 -0500
|
||||
+++ torque/src/server/node_manager.c 2021-01-28 17:24:52.041023032 -0500
|
||||
@@ -140,7 +140,7 @@
|
||||
#endif
|
||||
#include "runjob_help.hpp"
|
||||
#include "plugin_internal.h"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
#include "authorized_hosts.hpp"
|
||||
|
||||
#define IS_VALID_STR(STR) (((STR) != NULL) && ((STR)[0] != '\0'))
|
||||
diff -up torque/src/server/pbsnode.cpp.system-jsoncpp torque/src/server/pbsnode.cpp
|
||||
--- torque/src/server/pbsnode.cpp.system-jsoncpp 2021-01-28 17:22:27.386317821 -0500
|
||||
+++ torque/src/server/pbsnode.cpp 2021-01-28 17:22:38.162370359 -0500
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "../lib/Libnet/lib_net.h" /* pbs_getaddrinfo */
|
||||
#include "alps_constants.h"
|
||||
#include "policy_values.h"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
#include "plugin_internal.h"
|
||||
|
||||
#define MSG_LEN_LONG 160
|
||||
diff -up torque/src/test/catch_child/scaffolding.c.system-jsoncpp torque/src/test/catch_child/scaffolding.c
|
||||
--- torque/src/test/catch_child/scaffolding.c.system-jsoncpp 2021-01-28 17:25:02.101072079 -0500
|
||||
+++ torque/src/test/catch_child/scaffolding.c 2021-01-28 17:25:14.307131588 -0500
|
||||
@@ -20,7 +20,7 @@
|
||||
#include "mom_func.h"
|
||||
#include "mom_job_cleanup.h"
|
||||
#include "complete_req.hpp"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
|
||||
int server_down;
|
||||
int called_open_socket = 0;
|
||||
diff -up torque/src/test/job/test_uut.c.system-jsoncpp torque/src/test/job/test_uut.c
|
||||
--- torque/src/test/job/test_uut.c.system-jsoncpp 2021-01-28 17:25:24.008178885 -0500
|
||||
+++ torque/src/test/job/test_uut.c 2021-01-28 17:25:33.824226742 -0500
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "pbs_error.h"
|
||||
#include "pbs_job.h"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
#include <check.h>
|
||||
|
||||
extern attribute_def job_attr_def[];
|
||||
diff -up torque/src/test/machine/scaffolding.c.system-jsoncpp torque/src/test/machine/scaffolding.c
|
||||
--- torque/src/test/machine/scaffolding.c.system-jsoncpp 2021-01-28 17:26:18.917446590 -0500
|
||||
+++ torque/src/test/machine/scaffolding.c 2021-01-28 17:26:28.467493151 -0500
|
||||
@@ -6,7 +6,7 @@
|
||||
#include "pbs_error.h"
|
||||
#include "allocation.hpp"
|
||||
#include "complete_req.hpp"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
#include "numa_constants.h"
|
||||
|
||||
int num_for_host;
|
||||
diff -up torque/src/test/machine/test_uut.c.system-jsoncpp torque/src/test/machine/test_uut.c
|
||||
--- torque/src/test/machine/test_uut.c.system-jsoncpp 2021-01-28 17:26:37.960539433 -0500
|
||||
+++ torque/src/test/machine/test_uut.c 2021-01-28 17:26:48.545591403 -0500
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "pbs_job.h"
|
||||
#include "complete_req.hpp"
|
||||
#include "pbs_config.h"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
|
||||
extern int hardware_style;
|
||||
|
||||
diff -up torque/src/test/node_manager/scaffolding.c.system-jsoncpp torque/src/test/node_manager/scaffolding.c
|
||||
--- torque/src/test/node_manager/scaffolding.c.system-jsoncpp 2021-01-28 17:25:45.583284073 -0500
|
||||
+++ torque/src/test/node_manager/scaffolding.c 2021-01-28 17:25:57.028339872 -0500
|
||||
@@ -21,7 +21,7 @@
|
||||
#include "id_map.hpp"
|
||||
#include "machine.hpp"
|
||||
#include "complete_req.hpp"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
#include "authorized_hosts.hpp"
|
||||
|
||||
|
||||
diff -up torque/src/test/node_manager/test_uut.c.system-jsoncpp torque/src/test/node_manager/test_uut.c
|
||||
--- torque/src/test/node_manager/test_uut.c.system-jsoncpp 2021-01-28 17:26:59.731646817 -0500
|
||||
+++ torque/src/test/node_manager/test_uut.c 2021-01-28 17:27:08.815691817 -0500
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "test_uut.h"
|
||||
#include "pbs_error.h"
|
||||
#include "server.h"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
#include "complete_req.hpp"
|
||||
#include "pbs_nodes.h"
|
||||
|
||||
diff -up torque/src/test/numa_chip/scaffolding.c.system-jsoncpp torque/src/test/numa_chip/scaffolding.c
|
||||
--- torque/src/test/numa_chip/scaffolding.c.system-jsoncpp 2021-01-28 17:27:17.770736185 -0500
|
||||
+++ torque/src/test/numa_chip/scaffolding.c 2021-01-28 17:27:25.892776426 -0500
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "log.h"
|
||||
#include "pbs_error.h"
|
||||
#include "machine.hpp"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
#include "numa_constants.h"
|
||||
|
||||
const char *use_cores = "usecores";
|
||||
diff -up torque/src/test/numa_chip/test_uut.c.system-jsoncpp torque/src/test/numa_chip/test_uut.c
|
||||
--- torque/src/test/numa_chip/test_uut.c.system-jsoncpp 2021-01-28 17:27:33.612814672 -0500
|
||||
+++ torque/src/test/numa_chip/test_uut.c 2021-01-28 17:27:41.267852594 -0500
|
||||
@@ -6,7 +6,7 @@
|
||||
#include "hwloc.h"
|
||||
#include "pbs_error.h"
|
||||
#include <sstream>
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
|
||||
extern int recorded;
|
||||
|
||||
diff -up torque/src/test/numa_socket/scaffolding.c.system-jsoncpp torque/src/test/numa_socket/scaffolding.c
|
||||
--- torque/src/test/numa_socket/scaffolding.c.system-jsoncpp 2021-01-28 17:27:51.494903256 -0500
|
||||
+++ torque/src/test/numa_socket/scaffolding.c 2021-01-28 17:28:01.090950793 -0500
|
||||
@@ -6,7 +6,7 @@
|
||||
#include "pbs_error.h"
|
||||
#include "req.hpp"
|
||||
#include "allocation.hpp"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
|
||||
int hardware_style;
|
||||
float tasks;
|
||||
diff -up torque/src/test/numa_socket/test_uut.c.system-jsoncpp torque/src/test/numa_socket/test_uut.c
|
||||
--- torque/src/test/numa_socket/test_uut.c.system-jsoncpp 2021-01-28 17:28:13.915014321 -0500
|
||||
+++ torque/src/test/numa_socket/test_uut.c 2021-01-28 17:28:22.609057389 -0500
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "pbs_error.h"
|
||||
#include "allocation.hpp"
|
||||
#include "req.hpp"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
|
||||
extern float tasks;
|
||||
extern int placed;
|
||||
diff -up torque/src/test/parse_config/scaffolding.c.system-jsoncpp torque/src/test/parse_config/scaffolding.c
|
||||
--- torque/src/test/parse_config/scaffolding.c.system-jsoncpp 2021-01-28 17:29:00.388244539 -0500
|
||||
+++ torque/src/test/parse_config/scaffolding.c 2021-01-28 17:29:10.473294499 -0500
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "pbs_job.h"
|
||||
#include "u_tree.h"
|
||||
#include "log.h"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
#include "authorized_hosts.hpp"
|
||||
|
||||
#define LOG_BUF_SIZE 16384
|
||||
diff -up torque/src/test/parse_config/test_uut.c.system-jsoncpp torque/src/test/parse_config/test_uut.c
|
||||
--- torque/src/test/parse_config/test_uut.c.system-jsoncpp 2021-01-28 17:28:40.823147618 -0500
|
||||
+++ torque/src/test/parse_config/test_uut.c 2021-01-28 17:28:51.173198890 -0500
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "pbs_job.h"
|
||||
#include "mom_func.h"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
|
||||
extern int encode_used_ctr;
|
||||
extern int encode_flagged_attrs_ctr;
|
||||
diff -up torque/src/test/prolog/scaffolding.c.system-jsoncpp torque/src/test/prolog/scaffolding.c
|
||||
--- torque/src/test/prolog/scaffolding.c.system-jsoncpp 2021-01-28 17:29:18.930336393 -0500
|
||||
+++ torque/src/test/prolog/scaffolding.c 2021-01-28 17:29:28.645384519 -0500
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "libpbs.h" /* job_file */
|
||||
#include "mom_config.h"
|
||||
#include "mom_mach.h"
|
||||
-#include "json/json.h"
|
||||
+#include <json/json.h>
|
||||
|
||||
#define MAXLINE 1024
|
||||
|
||||
Loading…
Reference in new issue