graphviz: add patch for XCode 12 (#19485)
- [x] Add a patch to fix an implicit declaration error with apple-clang 12
This commit is contained in:
parent
a381b44b75
commit
7b7907077f
25
var/spack/repos/builtin/packages/graphviz/implicit.patch
Normal file
25
var/spack/repos/builtin/packages/graphviz/implicit.patch
Normal file
@ -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;
|
@ -77,6 +77,7 @@ class Graphviz(AutotoolsPackage):
|
|||||||
sha256='813e6529e79161a18b0f24a969b7de22f8417b2e942239e658b5402884541bc2',
|
sha256='813e6529e79161a18b0f24a969b7de22f8417b2e942239e658b5402884541bc2',
|
||||||
when='@:2.40%intel')
|
when='@:2.40%intel')
|
||||||
patch('ps2pdf.patch')
|
patch('ps2pdf.patch')
|
||||||
|
patch('implicit.patch')
|
||||||
|
|
||||||
if not MACOS_VERSION:
|
if not MACOS_VERSION:
|
||||||
conflicts('+quartz',
|
conflicts('+quartz',
|
||||||
|
Loading…
Reference in New Issue
Block a user