diff options
| author | Gregory Lee <lee218@llnl.gov> | 2019-07-31 14:47:36 -0700 |
|---|---|---|
| committer | Greg Becker <becker33@llnl.gov> | 2019-07-31 16:47:35 -0500 |
| commit | 162f1338d9afcb46b11dbceb6d9bc5f9d329fc9d (patch) | |
| tree | fdd2d4de5a26f3d7a5965db2a501a8f881f28df8 /var/spack/repos/builtin/packages/launchmon | |
| parent | 5c970613b67067cf1c10ebc7199fc12af393059c (diff) | |
| download | spack-162f1338d9afcb46b11dbceb6d9bc5f9d329fc9d.tar.gz spack-162f1338d9afcb46b11dbceb6d9bc5f9d329fc9d.tar.bz2 spack-162f1338d9afcb46b11dbceb6d9bc5f9d329fc9d.tar.xz spack-162f1338d9afcb46b11dbceb6d9bc5f9d329fc9d.zip | |
patch launchmon to fix char * conversion error (#12219)
Diffstat (limited to 'var/spack/repos/builtin/packages/launchmon')
| -rw-r--r-- | var/spack/repos/builtin/packages/launchmon/launchmon-char-conv.patch | 19 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/launchmon/package.py | 2 |
2 files changed, 21 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/launchmon/launchmon-char-conv.patch b/var/spack/repos/builtin/packages/launchmon/launchmon-char-conv.patch new file mode 100644 index 0000000000..e33255b542 --- /dev/null +++ b/var/spack/repos/builtin/packages/launchmon/launchmon-char-conv.patch @@ -0,0 +1,19 @@ +*** launchmon-v1.0.2/launchmon/src/linux/lmon_api/lmon_coloc_spawner.cxx.orig Wed Jul 31 10:44:44 2019 +--- launchmon-v1.0.2/launchmon/src/linux/lmon_api/lmon_coloc_spawner.cxx Wed Jul 31 10:45:04 2019 +*************** +*** 122,128 **** + memcpy(lmonpl, (*iter).c_str(), (*iter).size() + 1); + lmonpl += (*iter).size() + 1; + } +! lmonpl = '\0'; /* ending null */ + + if (write_lmonp_long_msg(m_be_master_sockfd, msg, msgsize) < 0) + { +--- 122,128 ---- + memcpy(lmonpl, (*iter).c_str(), (*iter).size() + 1); + lmonpl += (*iter).size() + 1; + } +! *lmonpl = '\0'; /* ending null */ + + if (write_lmonp_long_msg(m_be_master_sockfd, msg, msgsize) < 0) + { diff --git a/var/spack/repos/builtin/packages/launchmon/package.py b/var/spack/repos/builtin/packages/launchmon/package.py index 3b3096f64e..51aee11b49 100644 --- a/var/spack/repos/builtin/packages/launchmon/package.py +++ b/var/spack/repos/builtin/packages/launchmon/package.py @@ -26,6 +26,8 @@ class Launchmon(AutotoolsPackage): depends_on("boost") depends_on("spectrum-mpi", when='arch=ppc64le') + patch('launchmon-char-conv.patch', when='@1.0.2') + def setup_environment(self, spack_env, run_env): if self.spec.satisfies('@master'): # automake for launchmon requires the AM_PATH_LIBGCRYPT macro |