diff options
| author | noguchi-k <55966120+noguchi-k@users.noreply.github.com> | 2020-02-13 11:13:26 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-12 20:13:26 -0600 |
| commit | 38303a6a7929777053751846d6b512d863bb8d32 (patch) | |
| tree | d43a5c2a902d42329d0c7cf518ddcadeef67b134 | |
| parent | a7b43f1015a0559705f2714a680aa9f87313e603 (diff) | |
| download | spack-38303a6a7929777053751846d6b512d863bb8d32.tar.gz spack-38303a6a7929777053751846d6b512d863bb8d32.tar.bz2 spack-38303a6a7929777053751846d6b512d863bb8d32.tar.xz spack-38303a6a7929777053751846d6b512d863bb8d32.zip | |
macsio: cast JsonGetInt from int to unsigned int (#14736)
* macsio: cast from int to unsigned int
* macsio: apply a patch only when version is 1.1
| -rw-r--r-- | var/spack/repos/builtin/packages/macsio/cast.patch | 11 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/macsio/package.py | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/macsio/cast.patch b/var/spack/repos/builtin/packages/macsio/cast.patch new file mode 100644 index 0000000000..5d26d8ebac --- /dev/null +++ b/var/spack/repos/builtin/packages/macsio/cast.patch @@ -0,0 +1,11 @@ +--- spack-src/plugins/macsio_silo.c.org 2020-02-04 10:48:08.031770849 +0900 ++++ spack-src/plugins/macsio_silo.c 2020-02-04 10:48:48.175592435 +0900 +@@ -706,7 +706,7 @@ + char fileName[256]; + MACSIO_MIF_baton_t *bat; + MACSIO_MIF_ioFlags_t ioFlags = {MACSIO_MIF_WRITE, +- JsonGetInt(main_obj, "clargs/exercise_scr")&0x1}; ++ (unsigned int)JsonGetInt(main_obj, "clargs/exercise_scr")&0x1}; + + /* Without this barrier, I get strange behavior with Silo's MACSIO_MIF interface */ + //#warning CONFIRM THIS IS STILL NEEDED diff --git a/var/spack/repos/builtin/packages/macsio/package.py b/var/spack/repos/builtin/packages/macsio/package.py index 579fabda7e..46dccab4be 100644 --- a/var/spack/repos/builtin/packages/macsio/package.py +++ b/var/spack/repos/builtin/packages/macsio/package.py @@ -42,6 +42,9 @@ class Macsio(CMakePackage): depends_on('typhonio', when="+typhonio") depends_on('scr', when="+scr") + # Ref: https://github.com/LLNL/MACSio/commit/51b8c40cd9813adec5dd4dd6cee948bb9ddb7ee1 + patch('cast.patch', when='@1.1') + def cmake_args(self): spec = self.spec cmake_args = [] |