diff options
| author | Ian Stakenvicius <axs@gentoo.org> | 2019-10-22 13:02:55 -0400 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2019-10-22 13:06:18 -0400 |
| commit | 9af2199057ca2caed5237c4b9f9af2bbcbb71612 (patch) | |
| tree | 316af1492a4cf8027076eb2294bfeb397e601108 /sys-cluster/torque/files/torque-6.0.3-fix-emptystring-comparison.patch | |
| parent | 31bbb48431fc0514a990e5a383b9d28cc6c88cfc (diff) | |
| download | gentoo-9af2199057ca2caed5237c4b9f9af2bbcbb71612.tar.gz gentoo-9af2199057ca2caed5237c4b9f9af2bbcbb71612.tar.bz2 gentoo-9af2199057ca2caed5237c4b9f9af2bbcbb71612.zip | |
sys-cluster/torque: fix build issues with newer toolchains
Backported upstream patch for 6.1.3 codebase to fix "gcc-7 errors", which
resolves build errors from using C++ standards newer than 03.
Also removed unpatch torque-6.0.4 ebuild as it no longer builds
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
Diffstat (limited to 'sys-cluster/torque/files/torque-6.0.3-fix-emptystring-comparison.patch')
| -rw-r--r-- | sys-cluster/torque/files/torque-6.0.3-fix-emptystring-comparison.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/sys-cluster/torque/files/torque-6.0.3-fix-emptystring-comparison.patch b/sys-cluster/torque/files/torque-6.0.3-fix-emptystring-comparison.patch index 0666eda15937..6584f0ea8b33 100644 --- a/sys-cluster/torque/files/torque-6.0.3-fix-emptystring-comparison.patch +++ b/sys-cluster/torque/files/torque-6.0.3-fix-emptystring-comparison.patch @@ -19,3 +19,52 @@ while ((current != NULL) && (*current != '\0')) { +--- a/src/cmds/qsub_functions.c 2017-01-24 18:35:27.000000000 -0500 ++++ b/src/cmds/qsub_functions.c 2017-11-21 13:40:27.201964749 -0500 +@@ -900,7 +900,7 @@ + else + { + char *tmp_host = pbs_default(); +- if (tmp_host == '\0') ++ if (*tmp_host == '\0') + hash_add_or_exit(job_attr, ATTR_pbs_o_server, qsub_host, LOGIC_DATA); + else + hash_add_or_exit(job_attr, ATTR_pbs_o_server, tmp_host, LOGIC_DATA); +--- a/src/cmds/pbsnodes.c 2017-01-24 18:35:27.000000000 -0500 ++++ b/src/cmds/pbsnodes.c 2017-11-21 13:40:27.201964749 -0500 +@@ -900,7 +900,7 @@ + { + nodeargs = (char **)calloc(2, sizeof(char *)); + nodeargs[0] = strdup(""); +- nodeargs[1] = '\0'; ++ nodeargs[1] = NULL; + } + } + } +@@ -1020,7 +1020,7 @@ + + MXMLCreateE(&DE, "Data"); + +- for (lindex = 0;nodeargs[lindex] != '\0';lindex++) ++ for (lindex = 0;nodeargs[lindex] != NULL;lindex++) + { + bstatus = statnode(con, nodeargs[lindex]); + +@@ -1041,7 +1041,7 @@ + } + else + { +- for (lindex = 0;nodeargs[lindex] != '\0';lindex++) ++ for (lindex = 0;nodeargs[lindex] != NULL;lindex++) + { + bstatus = statnode(con, nodeargs[lindex]); + +@@ -1065,7 +1065,7 @@ + + /* list any node that is DOWN, OFFLINE, or UNKNOWN */ + +- for (lindex = 0;nodeargs[lindex] != '\0';lindex++) ++ for (lindex = 0;nodeargs[lindex] != NULL;lindex++) + { + bstatus = statnode(con, nodeargs[lindex]); + |