diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2020-10-23 00:26:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-23 09:26:55 +0200 |
| commit | 7b7907077f65b5f23c5cb73480af62235c6f7674 (patch) | |
| tree | eee1e398bbdee0bb7e462f70696ca23abfc84c20 /var | |
| parent | a381b44b75cc156b5f48507f5b42680de1299dd3 (diff) | |
| download | spack-7b7907077f65b5f23c5cb73480af62235c6f7674.tar.gz spack-7b7907077f65b5f23c5cb73480af62235c6f7674.tar.bz2 spack-7b7907077f65b5f23c5cb73480af62235c6f7674.tar.xz spack-7b7907077f65b5f23c5cb73480af62235c6f7674.zip | |
graphviz: add patch for XCode 12 (#19485)
- [x] Add a patch to fix an implicit declaration error with apple-clang 12
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/graphviz/implicit.patch | 25 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/graphviz/package.py | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/graphviz/implicit.patch b/var/spack/repos/builtin/packages/graphviz/implicit.patch new file mode 100644 index 0000000000..dd174761a9 --- /dev/null +++ b/var/spack/repos/builtin/packages/graphviz/implicit.patch @@ -0,0 +1,25 @@ +Fix "error: implicit declaration of function 'makeTetrix'" and another +problem fixed by the same upstream commit. +https://gitlab.com/graphviz/graphviz/-/commit/b4947d67a4ebd48ca0105d44f92e47f044e51600 +--- cmd/lefty/dot2l/dotlex.c.orig 2016-08-09 16:02:09.000000000 -0500 ++++ cmd/lefty/dot2l/dotlex.c 2020-08-27 14:45:45.000000000 -0500 +@@ -252,7 +252,7 @@ + char *q; + + q = lexbuf; +- if (p == '\0') ++ if (!p || *p == '\0') + return NULL; + while (isalnum (*p) || (*p == '_') || (!isascii (*p))) + *q++ = *p++; +--- cmd/tools/gvgen.c.orig 2016-11-22 23:43:56.000000000 -0600 ++++ cmd/tools/gvgen.c 2020-08-27 14:45:45.000000000 -0500 +@@ -458,6 +458,8 @@ + fprintf(opts.outfile, "}\ngraph {\n"); + } + ++extern void makeTetrix(int depth, edgefn ef); ++ + int main(int argc, char *argv[]) + { + GraphType graphType; diff --git a/var/spack/repos/builtin/packages/graphviz/package.py b/var/spack/repos/builtin/packages/graphviz/package.py index 523aa49c7f..a3009c9cf7 100644 --- a/var/spack/repos/builtin/packages/graphviz/package.py +++ b/var/spack/repos/builtin/packages/graphviz/package.py @@ -77,6 +77,7 @@ class Graphviz(AutotoolsPackage): sha256='813e6529e79161a18b0f24a969b7de22f8417b2e942239e658b5402884541bc2', when='@:2.40%intel') patch('ps2pdf.patch') + patch('implicit.patch') if not MACOS_VERSION: conflicts('+quartz', |