pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Adjust CC_VERSION check from gcc-8* to gcc-[89]*



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1c91d8a4fbd0
branches:  trunk
changeset: 386792:1c91d8a4fbd0
user:      abs <abs%pkgsrc.org@localhost>
date:      Mon Oct 29 14:41:56 2018 +0000

description:
Adjust CC_VERSION check from gcc-8* to gcc-[89]*

diffstat:

 pkgtools/rpm2pkg/Makefile      |  4 ++--
 sysutils/acpica-utils/Makefile |  4 ++--
 textproc/libodfgen/Makefile    |  4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r e58cc3cdd0ce -r 1c91d8a4fbd0 pkgtools/rpm2pkg/Makefile
--- a/pkgtools/rpm2pkg/Makefile Mon Oct 29 14:35:09 2018 +0000
+++ b/pkgtools/rpm2pkg/Makefile Mon Oct 29 14:41:56 2018 +0000
@@ -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 @@
 
 # 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 -r e58cc3cdd0ce -r 1c91d8a4fbd0 sysutils/acpica-utils/Makefile
--- a/sysutils/acpica-utils/Makefile    Mon Oct 29 14:35:09 2018 +0000
+++ b/sysutils/acpica-utils/Makefile    Mon Oct 29 14:41:56 2018 +0000
@@ -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 @@
 
 .include "../../mk/compiler.mk"
 
-.if !empty(CC_VERSION:Mgcc-8*)
+.if !empty(CC_VERSION:Mgcc-[89]*)
 CFLAGS+=       -Wno-error=format-truncation
 .endif
 
diff -r e58cc3cdd0ce -r 1c91d8a4fbd0 textproc/libodfgen/Makefile
--- a/textproc/libodfgen/Makefile       Mon Oct 29 14:35:09 2018 +0000
+++ b/textproc/libodfgen/Makefile       Mon Oct 29 14:41:56 2018 +0000
@@ -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 @@
 .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
 



Home | Main Index | Thread Index | Old Index