summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornoguchi-k <55966120+noguchi-k@users.noreply.github.com>2020-03-28 01:29:30 +0900
committerGitHub <noreply@github.com>2020-03-27 11:29:30 -0500
commit0ca5ad237a7ec10a148325b2c3601c024345788c (patch)
tree7d0d6070137bbd6ca0ef4f6ec4fcf0242b439c1d
parent953bd04cb375beb745b2993eed815d76ed4e1f9c (diff)
downloadspack-0ca5ad237a7ec10a148325b2c3601c024345788c.tar.gz
spack-0ca5ad237a7ec10a148325b2c3601c024345788c.tar.bz2
spack-0ca5ad237a7ec10a148325b2c3601c024345788c.tar.xz
spack-0ca5ad237a7ec10a148325b2c3601c024345788c.zip
denovogear: fixed comparison error (#15638)
-rw-r--r--var/spack/repos/builtin/packages/denovogear/newmat6.cpp.patch11
-rw-r--r--var/spack/repos/builtin/packages/denovogear/package.py2
2 files changed, 13 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/denovogear/newmat6.cpp.patch b/var/spack/repos/builtin/packages/denovogear/newmat6.cpp.patch
new file mode 100644
index 0000000000..36d2e240cd
--- /dev/null
+++ b/var/spack/repos/builtin/packages/denovogear/newmat6.cpp.patch
@@ -0,0 +1,11 @@
+--- spack-src/src/contrib/newmat/newmat6.cpp.org 2020-03-19 14:06:13.679032667 +0900
++++ spack-src/src/contrib/newmat/newmat6.cpp 2020-03-19 14:07:34.267492838 +0900
+@@ -428,7 +428,7 @@
+ {
+ if (&gm == this) { REPORT tag_val = -1; return; }
+ REPORT
+- if (indx > 0) { delete [] indx; indx = 0; }
++ if (indx != NULL) { delete [] indx; indx = 0; }
+ ((CroutMatrix&)gm).get_aux(*this);
+ Eq(gm);
+ }
diff --git a/var/spack/repos/builtin/packages/denovogear/package.py b/var/spack/repos/builtin/packages/denovogear/package.py
index 8f475492c1..bc683febef 100644
--- a/var/spack/repos/builtin/packages/denovogear/package.py
+++ b/var/spack/repos/builtin/packages/denovogear/package.py
@@ -25,3 +25,5 @@ class Denovogear(CMakePackage):
depends_on('zlib', type=('link'))
patch('stream-open.patch', when='@:1.1.1')
+ # fix: ordered comparison between pointer and zero.
+ patch('newmat6.cpp.patch')