[pkgsrc/pkgsrc-2022Q1]: pkgsrc/print/poppler Pullup ticket #6639 - requested ...

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/94c24171ae71
branches:  pkgsrc-2022Q1
changeset: 380377:94c24171ae71
user:      spz <spz%pkgsrc.org@localhost>
date:      Sun Jun 05 08:24:08 2022 +0000

description:
Pullup ticket #6639 - requested by nia
print/poppler: build fix

Revisions pulled up:
- print/poppler/Makefile.common                                 1.134
- print/poppler/buildlink3.mk                                   1.90

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        nia
   Date:                Sat May 21 07:43:57 UTC 2022

   Modified Files:
        pkgsrc/print/poppler: Makefile.common buildlink3.mk

   Log Message:
   poppler: Bump GCC requirement to GCC 7, it wants std::optional.


   To generate a diff of this commit:
   cvs rdiff -u -r1.133 -r1.134 pkgsrc/print/poppler/Makefile.common
   cvs rdiff -u -r1.89 -r1.90 pkgsrc/print/poppler/buildlink3.mk

diffstat:

 print/poppler/Makefile.common |  15 +++++++++++++--
 print/poppler/buildlink3.mk   |   4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r 621b3921f601 -r 94c24171ae71 print/poppler/Makefile.common
--- a/print/poppler/Makefile.common     Sun Jun 05 06:20:41 2022 +0000
+++ b/print/poppler/Makefile.common     Sun Jun 05 08:24:08 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.132 2022/03/08 10:09:22 wiz Exp $
+# $NetBSD: Makefile.common,v 1.132.2.1 2022/06/05 08:24:08 spz Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-cpp/Makefile
@@ -23,7 +23,18 @@
 USE_CMAKE=             yes
 USE_LANGUAGES=         c c++17
 USE_TOOLS+=            pkg-config
-GCC_REQD+=             5
+GCC_REQD+=             7 # std::optional
+
+.include "../../mk/bsd.prefs.mk"
+
+# This package will link against libstdc++.so from the pkgsrc GCC when the
+# base OS GCC doesn't meet the minimum requirement. Thus we do this so the
+# appropriate gcc-libs package will be captured as a dependency, otherwise
+# binary packages will be broken.
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 090000
+USE_PKGSRC_GCC=                yes
+USE_PKGSRC_GCC_RUNTIME=        yes
+.endif
 
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
diff -r 621b3921f601 -r 94c24171ae71 print/poppler/buildlink3.mk
--- a/print/poppler/buildlink3.mk       Sun Jun 05 06:20:41 2022 +0000
+++ b/print/poppler/buildlink3.mk       Sun Jun 05 08:24:08 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.88 2021/09/29 10:10:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.88.4.1 2022/06/05 08:24:08 spz Exp $
 
 BUILDLINK_TREE+=       poppler
 
@@ -9,7 +9,7 @@
 BUILDLINK_ABI_DEPENDS.poppler+=        poppler>=21.09.0
 BUILDLINK_PKGSRCDIR.poppler?=  ../../print/poppler
 
-GCC_REQD+=     5
+GCC_REQD+=     7
 
 .include "../../devel/nss/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"