Fri Dec 14 14:34:05 2018 UTC ()
poppler: Use GCC_REQD+=, not GCC_REQD=.


(gson)
diff -r1.104 -r1.105 pkgsrc/print/poppler/Makefile.common

cvs diff -r1.104 -r1.105 pkgsrc/print/poppler/Makefile.common (expand / switch to unified diff)

--- pkgsrc/print/poppler/Makefile.common 2018/12/14 13:16:26 1.104
+++ pkgsrc/print/poppler/Makefile.common 2018/12/14 14:34:05 1.105
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile.common,v 1.104 2018/12/14 13:16:26 gson Exp $ 1# $NetBSD: Makefile.common,v 1.105 2018/12/14 14:34:05 gson Exp $
2# 2#
3# used by print/poppler/Makefile 3# used by print/poppler/Makefile
4# used by print/poppler-cpp/Makefile 4# used by print/poppler-cpp/Makefile
5# used by print/poppler-glib/Makefile 5# used by print/poppler-glib/Makefile
6# used by print/poppler-includes/Makefile 6# used by print/poppler-includes/Makefile
7# used by print/poppler-qt5/Makefile 7# used by print/poppler-qt5/Makefile
8# used by print/poppler-utils/Makefile 8# used by print/poppler-utils/Makefile
9 9
10POPPLER_VERS= 0.72.0 10POPPLER_VERS= 0.72.0
11DISTNAME= poppler-${POPPLER_VERS} 11DISTNAME= poppler-${POPPLER_VERS}
12CATEGORIES= print 12CATEGORIES= print
13MASTER_SITES= https://poppler.freedesktop.org/ 13MASTER_SITES= https://poppler.freedesktop.org/
14EXTRACT_SUFX= .tar.xz 14EXTRACT_SUFX= .tar.xz
15 15
16HOMEPAGE= https://poppler.freedesktop.org/ 16HOMEPAGE= https://poppler.freedesktop.org/
17LICENSE= gnu-gpl-v2 17LICENSE= gnu-gpl-v2
18 18
19DISTINFO_FILE= ${.CURDIR}/../../print/poppler/distinfo 19DISTINFO_FILE= ${.CURDIR}/../../print/poppler/distinfo
20PATCHDIR= ${.CURDIR}/../../print/poppler/patches 20PATCHDIR= ${.CURDIR}/../../print/poppler/patches
21 21
22USE_TOOLS+= pkg-config 22USE_TOOLS+= pkg-config
23USE_LIBTOOL= yes 23USE_LIBTOOL= yes
24USE_LANGUAGES= c c++14 24USE_LANGUAGES= c c++14
25GCC_REQD= 4.9 25GCC_REQD+= 4.9
26 26
27USE_CMAKE= yes 27USE_CMAKE= yes
28 28
29# Don't accidentally find libtiff 29# Don't accidentally find libtiff
30CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=TRUE 30CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=TRUE
31 31
32.include "../../mk/compiler.mk" 32.include "../../mk/compiler.mk"
33.if !empty(PKGSRC_COMPILER:Mclang) 33.if !empty(PKGSRC_COMPILER:Mclang)
34BUILDLINK_TRANSFORM+= rm:-fno-check-new 34BUILDLINK_TRANSFORM+= rm:-fno-check-new
35.endif 35.endif
36 36
37.include "../../graphics/openjpeg/buildlink3.mk" 37.include "../../graphics/openjpeg/buildlink3.mk"