diff options
| author | ketsubouchi <kenta.tsubouchi@hac-inc.co.jp> | 2020-09-10 11:03:59 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 21:03:59 -0500 |
| commit | b014ffcd3dd65e57a2c2871aea19b45bddd68155 (patch) | |
| tree | ca0ca7c98a365ad759cab3f9909d30581e90a981 | |
| parent | 7b2c59e6cf5173ca7e22c7c568f5a898031c40ec (diff) | |
| download | spack-b014ffcd3dd65e57a2c2871aea19b45bddd68155.tar.gz spack-b014ffcd3dd65e57a2c2871aea19b45bddd68155.tar.bz2 spack-b014ffcd3dd65e57a2c2871aea19b45bddd68155.tar.xz spack-b014ffcd3dd65e57a2c2871aea19b45bddd68155.zip | |
darshan-util: remove return(-1) from void function (#18504)
* darshan-util: remove return(-1) from void function
* Update var/spack/repos/builtin/packages/darshan-util/package.py
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* Update var/spack/repos/builtin/packages/darshan-util/package.py
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/darshan-util/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/darshan-util/retvoid.patch | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/darshan-util/package.py b/var/spack/repos/builtin/packages/darshan-util/package.py index af5502a7fb..abd194e027 100644 --- a/var/spack/repos/builtin/packages/darshan-util/package.py +++ b/var/spack/repos/builtin/packages/darshan-util/package.py @@ -31,6 +31,8 @@ class DarshanUtil(Package): depends_on('zlib') depends_on('bzip2', when="+bzip2", type=("build", "link", "run")) + patch('retvoid.patch', when='@3.2.0:3.2.1') + def install(self, spec, prefix): options = ['CC=%s' % self.compiler.cc, diff --git a/var/spack/repos/builtin/packages/darshan-util/retvoid.patch b/var/spack/repos/builtin/packages/darshan-util/retvoid.patch new file mode 100644 index 0000000000..63175b61d7 --- /dev/null +++ b/var/spack/repos/builtin/packages/darshan-util/retvoid.patch @@ -0,0 +1,12 @@ +diff -u -r -N a/darshan-util/darshan-logutils.c b/darshan-util/darshan-logutils.c +--- a/darshan-util/darshan-logutils.c 2020-09-04 15:02:21.000000000 +0900 ++++ b/darshan-util/darshan-logutils.c 2020-09-04 15:07:44.000000000 +0900 +@@ -1915,7 +1915,7 @@ + if(ret < 0) + { + darshan_log_close(fd); +- return(-1); ++ return; + } + + int num = HASH_CNT(hlink, name_hash); |