Wed Dec 29 12:10:32 2021 UTC ()
Build with -fopenmp on NetBSD/powerpc, so that we link explicitly
with -lgomp and thereby avoid overflowing the static thread local
storage allocated in ld.elf_so when libgomp.so is dlopen()ed
indirectly via libgvplugin_gd.so.

Bump PKGREVISION.


(he)
diff -r1.241 -r1.242 pkgsrc/graphics/graphviz/Makefile
cvs diff -r1.241 -r1.242 pkgsrc/graphics/graphviz/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/graphviz/Makefile 2021/12/08 16:04:56 1.241
+++ pkgsrc/graphics/graphviz/Makefile 2021/12/29 12:10:32 1.242
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.241 2021/12/08 16:04:56 adam Exp $ 1# $NetBSD: Makefile,v 1.242 2021/12/29 12:10:32 he Exp $
2 2
3DISTNAME= graphviz-2.49.3 3DISTNAME= graphviz-2.49.3
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= https://gitlab.com/graphviz/graphviz/-/archive/${PKGVERSION_NOREV}/ 6MASTER_SITES= https://gitlab.com/graphviz/graphviz/-/archive/${PKGVERSION_NOREV}/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= sno@NetBSD.org 9MAINTAINER= sno@NetBSD.org
10HOMEPAGE= https://www.graphviz.org/ 10HOMEPAGE= https://www.graphviz.org/
11COMMENT= Graph Drawing Programs from AT&T Research and Lucent Bell Labs 11COMMENT= Graph Drawing Programs from AT&T Research and Lucent Bell Labs
12LICENSE= epl-v1.0 12LICENSE= epl-v1.0
13 13
14TOOL_DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript 14TOOL_DEPENDS+= ghostscript-[0-9]*:../../print/ghostscript
15 15
16CHECK_FILES_SKIP+= ${PREFIX}/lib/graphviz/config6 16CHECK_FILES_SKIP+= ${PREFIX}/lib/graphviz/config6
17CHECK_PORTABILITY_SKIP+= windows/* 17CHECK_PORTABILITY_SKIP+= windows/*
@@ -92,26 +92,33 @@ REPLACE.tclsh.old= .*tclsh @@ -92,26 +92,33 @@ REPLACE.tclsh.old= .*tclsh
92REPLACE.tclsh.new= ${PREFIX}/bin/tclsh 92REPLACE.tclsh.new= ${PREFIX}/bin/tclsh
93REPLACE_FILES.tclsh= tclpkg/gv/demo/modgraph.tcl 93REPLACE_FILES.tclsh= tclpkg/gv/demo/modgraph.tcl
94 94
95REPLACE_PERL+= tclpkg/gv/demo/modgraph.pl contrib/dotmcl.pl \ 95REPLACE_PERL+= tclpkg/gv/demo/modgraph.pl contrib/dotmcl.pl \
96 contrib/dirgraph/dirgraph.pl 96 contrib/dirgraph/dirgraph.pl
97 97
98.include "../../mk/bsd.prefs.mk" 98.include "../../mk/bsd.prefs.mk"
99 99
100.include "../../mk/compiler.mk" 100.include "../../mk/compiler.mk"
101.if !empty(CC_VERSION:Mgcc-2*) 101.if !empty(CC_VERSION:Mgcc-2*)
102BUILDLINK_TRANSFORM+= rm:-Wno-unused-parameter 102BUILDLINK_TRANSFORM+= rm:-Wno-unused-parameter
103.endif 103.endif
104 104
 105.if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc")
 106# Forces link with -lgomp directly instead of via dlopen()
 107# so we don't overflow thread-local storage in ld.elf_so
 108CFLAGS+= -fopenmp
 109CONFIGURE_ARGS+= CFLAGS="${CFLAGS}"
 110.endif
 111
105.if ${OPSYS} == "FreeBSD" 112.if ${OPSYS} == "FreeBSD"
106SUBST_CLASSES+= sfflags 113SUBST_CLASSES+= sfflags
107SUBST_STAGE.sfflags= pre-configure 114SUBST_STAGE.sfflags= pre-configure
108SUBST_MESSAGE.sfflags= Fixing SF_FLAGS identifier for FreeBSD. 115SUBST_MESSAGE.sfflags= Fixing SF_FLAGS identifier for FreeBSD.
109SUBST_FILES.sfflags= lib/sfio/sfclrlock.c lib/sfio/sfio_t.h lib/sfio/sfio.h 116SUBST_FILES.sfflags= lib/sfio/sfclrlock.c lib/sfio/sfio_t.h lib/sfio/sfio.h
110SUBST_FILES.sfflags+= lib/sfio/sfnew.c lib/sfio/sfopen.c lib/sfio/sfset.c 117SUBST_FILES.sfflags+= lib/sfio/sfnew.c lib/sfio/sfopen.c lib/sfio/sfset.c
111SUBST_SED.sfflags= -e 's|SF_FLAGS|SFIO_FLAGS|g' 118SUBST_SED.sfflags= -e 's|SF_FLAGS|SFIO_FLAGS|g'
112.endif 119.endif
113 120
114pre-configure: 121pre-configure:
115 cd ${WRKSRC} && autoreconf -fiv 122 cd ${WRKSRC} && autoreconf -fiv
116 123
117# Remove temporary files and directories created by re-linking "libgv_lua.la". 124# Remove temporary files and directories created by re-linking "libgv_lua.la".