zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

darshan-util: remove return(-1) from void function (#18504)

Browse Source 
* 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>
This commit is contained in:
ketsubouchi 2020-09-10 11:03:59 +09:00 committed by GitHub
parent 7b2c59e6cf
commit b014ffcd3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/darshan-util/package.py
View File

@ -31,6 +31,8 @@ class DarshanUtil(Package):
depends_on('zlib') depends_on('zlib')
depends_on('bzip2', when="+bzip2", type=("build", "link", "run")) depends_on('bzip2', when="+bzip2", type=("build", "link", "run"))
patch('retvoid.patch', when='@3.2.0:3.2.1')
def install(self, spec, prefix): def install(self, spec, prefix):
options = ['CC=%s' % self.compiler.cc, options = ['CC=%s' % self.compiler.cc,

12
var/spack/repos/builtin/packages/darshan-util/retvoid.patch Normal file
View File

@ -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);