diff options
| author | spz <spz@pkgsrc.org> | 2022-06-05 08:24:08 +0000 |
|---|---|---|
| committer | spz <spz@pkgsrc.org> | 2022-06-05 08:24:08 +0000 |
| commit | 752aa1f9ff810a34c03d0d2a49ac816123ec7b86 (patch) | |
| tree | 8f9fc467c6f27ee79ef869a445e7023aee62c88d | |
| parent | 316ca6735edb8a530961ff1f22eba1ffffda2ed4 (diff) | |
| download | pkgsrc-752aa1f9ff810a34c03d0d2a49ac816123ec7b86.tar.gz | |
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
| -rw-r--r-- | print/poppler/Makefile.common | 15 | ||||
| -rw-r--r-- | print/poppler/buildlink3.mk | 4 |
2 files changed, 15 insertions, 4 deletions
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common index dda6276e04b..93a68da4b90 100644 --- a/print/poppler/Makefile.common +++ b/print/poppler/Makefile.common @@ -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 @@ PATCHDIR= ${.CURDIR}/../../print/poppler/patches 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 --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk index 16cc5d15412..c5e187bd3cc 100644 --- a/print/poppler/buildlink3.mk +++ b/print/poppler/buildlink3.mk @@ -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_API_DEPENDS.poppler+= poppler>=0.5.1 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" |