diff options
author | Ian Stakenvicius <axs@gentoo.org> | 2019-03-07 12:36:52 -0500 |
---|---|---|
committer | Ian Stakenvicius <axs@gentoo.org> | 2019-03-07 12:37:47 -0500 |
commit | f6a2e18a206684aaba8de78d3c2997d9f18a92cb (patch) | |
tree | e8c3f916569fd113b225546ed5174f3c63b865d6 /sys-cluster/torque/files/tcl8.6.patch | |
parent | sys-cluster/torque: bump to 6.0.4 (diff) | |
download | gentoo-f6a2e18a206684aaba8de78d3c2997d9f18a92cb.tar.gz gentoo-f6a2e18a206684aaba8de78d3c2997d9f18a92cb.tar.bz2 gentoo-f6a2e18a206684aaba8de78d3c2997d9f18a92cb.zip |
sys-cluster/torque: cleanup filesdir
Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Diffstat (limited to 'sys-cluster/torque/files/tcl8.6.patch')
-rw-r--r-- | sys-cluster/torque/files/tcl8.6.patch | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/sys-cluster/torque/files/tcl8.6.patch b/sys-cluster/torque/files/tcl8.6.patch deleted file mode 100644 index 0361dbfead0a..000000000000 --- a/sys-cluster/torque/files/tcl8.6.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 061f15e06d6cf85e951cd321360067de5f0b2ce0 Mon Sep 17 00:00:00 2001 -From: Justin Bronder <jsbronder@gmail.com> -Date: Thu, 7 Mar 2013 22:33:04 -0500 -Subject: [PATCH] support tcl-8.6 - ---- - src/cmds/qstat.c | 13 +++++++++---- - src/scheduler.tcl/pbs_tclWrap.c | 6 +++--- - 2 files changed, 12 insertions(+), 7 deletions(-) - -diff --git a/src/cmds/qstat.c b/src/cmds/qstat.c -index 5f85de7..7f289ba 100644 ---- a/src/cmds/qstat.c -+++ b/src/cmds/qstat.c -@@ -88,6 +88,11 @@ - #if TCL_QSTAT - #include <sys/stat.h> - #include <tcl.h> -+#if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6 -+#define Tcl_GetStringResult(x) x->result -+#define Tcl_GetErrorLine(x) x->errorLine -+#define Tcl_SetResult(x, y, z) x->result = y -+#endif - #if TCLX - #include <tclExtend.h> - #endif -@@ -1856,7 +1861,7 @@ tcl_init(void) - if (Tcl_Init(interp) == TCL_ERROR) - { - fprintf(stderr, "Tcl_Init error: %s", -- interp->result); -+ Tcl_GetStringResult(interp)); - } - - #if TCLX -@@ -1869,7 +1874,7 @@ tcl_init(void) - { - #endif - fprintf(stderr, "Tclx_Init error: %s", -- interp->result); -+ Tcl_GetStringResult(interp)); - } - - #endif /* TCLX */ -@@ -1980,10 +1985,10 @@ void tcl_run( - trace = (char *)Tcl_GetVar(interp, "errorInfo", 0); - - if (trace == NULL) -- trace = interp->result; -+ trace = Tcl_GetStringResult(interp); - - fprintf(stderr, "%s: TCL error @ line %d: %s\n", -- script, interp->errorLine, trace); -+ script, Tcl_GetErrorLine(interp), trace); - } - - Tcl_DeleteInterp(interp); -diff --git a/src/scheduler.tcl/pbs_tclWrap.c b/src/scheduler.tcl/pbs_tclWrap.c -index e859ae5..194c24b 100644 ---- a/src/scheduler.tcl/pbs_tclWrap.c -+++ b/src/scheduler.tcl/pbs_tclWrap.c -@@ -924,7 +924,7 @@ char *argv[]; - - if (argc != 2) - { -- sprintf(interp->result, -+ sprintf(Tcl_GetStringResult(interp), - "%s: wrong # args: job_id", argv[0]); - return TCL_ERROR; - } -@@ -936,11 +936,11 @@ char *argv[]; - return TCL_OK; - } - -- interp->result = "0"; -+ Tcl_SetResult(interp, "0", TCL_STATIC); - - if (pbs_rerunjob(connector, argv[1], extend)) - { -- interp->result = "-1"; -+ Tcl_SetResult(interp, "-1", TCL_STATIC); - msg = pbs_geterrmsg(connector); - sprintf(log_buffer, "%s (%d)", msg ? msg : fail, pbs_errno); - log_err(-1, argv[0], log_buffer); --- -1.7.12.4 - |