pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[.joined/pkgsrc/pkgsrc-2021Q4]: .joined/pkgsrc/graphics/graphviz Pullup ticke...



details:   https://anonhg.NetBSD.org/.joined/pkgsrc/rev/ede77f119649
branches:  pkgsrc-2021Q4
changeset: 371109:ede77f119649
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Jan 01 16:51:45 2022 +0000

description:
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.

diffstat:

 graphics/graphviz/Makefile |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 7a17103417b0 -r ede77f119649 graphics/graphviz/Makefile
--- a/graphics/graphviz/Makefile        Sat Jan 01 16:49:10 2022 +0000
+++ b/graphics/graphviz/Makefile        Sat Jan 01 16:51:45 2022 +0000
@@ -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 @@
 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



Home | Main Index | Thread Index | Old Index