diff options
| author | abs <abs@pkgsrc.org> | 2018-10-29 14:41:56 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2018-10-29 14:41:56 +0000 |
| commit | 8da0d1125640bdb4d59ebde1389217ae378122f8 (patch) | |
| tree | 2134643c1bfc1918d131c1996127a77920afef0f | |
| parent | 96465dcf5636f0458a396fe86774690cd4232b9c (diff) | |
| download | pkgsrc-8da0d1125640bdb4d59ebde1389217ae378122f8.tar.gz | |
Adjust CC_VERSION check from gcc-8* to gcc-[89]*
| -rw-r--r-- | pkgtools/rpm2pkg/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/acpica-utils/Makefile | 4 | ||||
| -rw-r--r-- | textproc/libodfgen/Makefile | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile index 9f20defe18b..c09c9221098 100644 --- a/pkgtools/rpm2pkg/Makefile +++ b/pkgtools/rpm2pkg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2018/10/27 21:03:09 abs Exp $ +# $NetBSD: Makefile,v 1.69 2018/10/29 14:41:56 abs Exp $ PKGNAME= rpm2pkg-3.2.3 CATEGORIES= pkgtools @@ -32,7 +32,7 @@ MAKE_FLAGS+= ACTIVE_CC=clang # using pkgsrc gcc8 fails to build with WARNS on NetBSD with: # .../stdlib.h:115:1: error: ignoring attribute ‘pure’ in declaration of a built-in function ‘abs’ because it conflicts with attribute ‘const’ [-Werror=attributes] -.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no" && empty(CC_VERSION:Mgcc-8*) +.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no" && empty(CC_VERSION:Mgcc-[89]*) MAKE_ENV+= WARNS=4 .else MAKE_ENV+= NOGCCERROR=yes diff --git a/sysutils/acpica-utils/Makefile b/sysutils/acpica-utils/Makefile index 44aa82e2ddc..c14512a5f7d 100644 --- a/sysutils/acpica-utils/Makefile +++ b/sysutils/acpica-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2018/10/27 21:44:53 abs Exp $ +# $NetBSD: Makefile,v 1.12 2018/10/29 14:42:08 abs Exp $ # DISTNAME= acpica-unix2-20160930 @@ -54,7 +54,7 @@ do-test: .include "../../mk/compiler.mk" -.if !empty(CC_VERSION:Mgcc-8*) +.if !empty(CC_VERSION:Mgcc-[89]*) CFLAGS+= -Wno-error=format-truncation .endif diff --git a/textproc/libodfgen/Makefile b/textproc/libodfgen/Makefile index c12a1fdaffe..e4d55b7d0ea 100644 --- a/textproc/libodfgen/Makefile +++ b/textproc/libodfgen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2018/10/28 16:32:36 abs Exp $ +# $NetBSD: Makefile,v 1.20 2018/10/29 14:42:19 abs Exp $ DISTNAME= libodfgen-0.1.6 PKGREVISION= 7 @@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --with-sharedptr=tr1 .endif # Avoid erroring out due to multiple -Werror=parentheses with gcc8 -.if !empty(CC_VERSION:Mgcc-8*) +.if !empty(CC_VERSION:Mgcc-[89]*) CONFIGURE_ARGS+=--disable-werror .endif |