CVS commit: pkgsrc/pkgtools/rpm2pkg

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Mon Oct 29 14:41:56 UTC 2018

Modified Files:
        pkgsrc/pkgtools/rpm2pkg: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/pkgtools/rpm2pkg/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/rpm2pkg/Makefile
diff -u pkgsrc/pkgtools/rpm2pkg/Makefile:1.68 pkgsrc/pkgtools/rpm2pkg/Makefile:1.69
--- pkgsrc/pkgtools/rpm2pkg/Makefile:1.68       Sat Oct 27 21:03:09 2018
+++ pkgsrc/pkgtools/rpm2pkg/Makefile    Mon Oct 29 14:41:56 2018
@@ -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