[pkgsrc/trunk]: pkgsrc/print/poppler poppler: Bump GCC requirement to GCC 7, ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6d2d7b5c8759
branches:  trunk
changeset: 379637:6d2d7b5c8759
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat May 21 07:43:57 2022 +0000

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

diffstat:

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

diffs (47 lines):

diff -r 6267b461d78a -r 6d2d7b5c8759 print/poppler/Makefile.common
--- a/print/poppler/Makefile.common     Sat May 21 07:42:12 2022 +0000
+++ b/print/poppler/Makefile.common     Sat May 21 07:43:57 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.133 2022/05/04 06:33:40 wiz Exp $
+# $NetBSD: Makefile.common,v 1.134 2022/05/21 07:43:57 nia 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 6267b461d78a -r 6d2d7b5c8759 print/poppler/buildlink3.mk
--- a/print/poppler/buildlink3.mk       Sat May 21 07:42:12 2022 +0000
+++ b/print/poppler/buildlink3.mk       Sat May 21 07:43:57 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.89 2022/05/04 21:05:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.90 2022/05/21 07:43:57 nia Exp $
 
 BUILDLINK_TREE+=       poppler
 
@@ -9,7 +9,7 @@
 BUILDLINK_ABI_DEPENDS.poppler+=        poppler>=22.04.0
 BUILDLINK_PKGSRCDIR.poppler?=  ../../print/poppler
 
-GCC_REQD+=     5
+GCC_REQD+=     7
 
 .include "../../devel/nss/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"