From: Magnus Jacobsson Date: Sun, 22 Aug 2021 06:40:28 +0000 (+0200) Subject: ortho: autotools: set also GVC_EXPORTS X-Git-Tag: 2.49.2~32^2~10 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a597219aaaaee751f2c1cf6d7b1ad383c8aea589;p=graphviz ortho: autotools: set also GVC_EXPORTS The immediate reason for this change is to correct the Microsoft-specfic storage-class attributes in autotools builds with Cygwin. The object modules from the static ortho lib is statically linked into the gvc shared lib which means that its symbols should be exported from gvc instead of imported. This is the second and final step in fixing these errors in autotools builds with Cygwin: /usr/lib/gcc/x86_64-pc-cygwin/10/../../../../x86_64-pc-cygwin/bin/ld: ../../lib/dotgen/.libs/libdotgen_C.a(dotsplines.o): in function `_dot_splines': /home/magja/graphviz/lib/dotgen/dotsplines.c:334: undefined reference to `__imp_orthoEdges' /usr/lib/gcc/x86_64-pc-cygwin/10/../../../../x86_64-pc-cygwin/bin/ld: /home/magja/graphviz/lib/dotgen/dotsplines.c:337: undefined reference to `__imp_orthoEdges' The _BLD_gvc symbol is used for basically the same purpose as GVC_EXPORTS. Using both is a temporary measure until an upcoming commit series towards https://gitlab.com/graphviz/graphviz/-/issues/2058#note_678679545 cleans up the control of the Windows specific storage-class attributes --- diff --git a/lib/ortho/Makefile.am b/lib/ortho/Makefile.am index e06794174..b624bf9a0 100644 --- a/lib/ortho/Makefile.am +++ b/lib/ortho/Makefile.am @@ -10,7 +10,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/cdt if WITH_ORTHO -AM_CFLAGS = -D_BLD_gvc=1 +AM_CFLAGS = -D_BLD_gvc=1 -DGVC_EXPORTS endif noinst_HEADERS = fPQ.h ortho.h maze.h partition.h rawgraph.h sgraph.h structures.h trap.h