CVS commit: [pkgsrc-2021Q4] pkgsrc/graphics/graphviz

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Jan  1 16:51:45 UTC 2022

Modified Files:
        pkgsrc/graphics/graphviz [pkgsrc-2021Q4]: Makefile

Log Message:
Pullup ticket #6557 - requested by he
graphics/graphviz: PowerPC build fix

Revisions pulled up:
- graphics/graphviz/Makefile                                    1.242

---
   Module Name: pkgsrc
   Committed By:        he
   Date:                Wed Dec 29 12:10:32 UTC 2021

   Modified Files:
        pkgsrc/graphics/graphviz: Makefile

   Log Message:
   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.


To generate a diff of this commit:
cvs rdiff -u -r1.241 -r1.241.2.1 pkgsrc/graphics/graphviz/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/graphviz/Makefile
diff -u pkgsrc/graphics/graphviz/Makefile:1.241 pkgsrc/graphics/graphviz/Makefile:1.241.2.1
--- pkgsrc/graphics/graphviz/Makefile:1.241     Wed Dec  8 16:04:56 2021
+++ pkgsrc/graphics/graphviz/Makefile   Sat Jan  1 16:51:45 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.241 2021/12/08 16:04:56 adam Exp $
+# $NetBSD: Makefile,v 1.241.2.1 2022/01/01 16:51:45 bsiegert Exp $
 
 DISTNAME=      graphviz-2.49.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics
 MASTER_SITES=  https://gitlab.com/graphviz/graphviz/-/archive/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.bz2
@@ -102,6 +102,13 @@ REPLACE_PERL+=             tclpkg/gv/demo/modgraph.
 BUILDLINK_TRANSFORM+=  rm:-Wno-unused-parameter
 .endif
 
+.if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc")
+# Forces link with -lgomp directly instead of via dlopen()
+# so we don't overflow thread-local storage in ld.elf_so
+CFLAGS+=               -fopenmp
+CONFIGURE_ARGS+=       CFLAGS="${CFLAGS}"
+.endif
+
 .if ${OPSYS} == "FreeBSD"
 SUBST_CLASSES+=                sfflags
 SUBST_STAGE.sfflags=   pre-configure