CVS commit: pkgsrc/mk/compiler

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed May 23 10:17:58 UTC 2018

Modified Files:
        pkgsrc/mk/compiler: gcc.mk

Log Message:
mk: Fix GCC PKGPATH matches.


To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 pkgsrc/mk/compiler/gcc.mk

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

Modified files:

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.190 pkgsrc/mk/compiler/gcc.mk:1.191
--- pkgsrc/mk/compiler/gcc.mk:1.190     Wed May 23 08:11:59 2018
+++ pkgsrc/mk/compiler/gcc.mk   Wed May 23 10:17:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.190 2018/05/23 08:11:59 jperkin Exp $
+# $NetBSD: gcc.mk,v 1.191 2018/05/23 10:17:58 jperkin Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -904,7 +904,8 @@ PREPEND_PATH+=      ${_GCC_DIR}/bin
 # Add dependency on GCC libraries if requested.
 .if (defined(_USE_GCC_SHLIB) && !empty(_USE_GCC_SHLIB:M[Yy][Ee][Ss])) && !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
 #  Special case packages which are themselves a dependency of gcc runtime.
-.  if empty(PKGPATH:Mdevel/libtool-base) && empty(PKGPATH:Mdevel/binutils) && empty(PKGPATH:Mlang/gcc??)
+.  if empty(PKGPATH:Mdevel/libtool-base) && empty(PKGPATH:Mdevel/binutils) && \
+      empty(PKGPATH:Mlang/gcc4?) && empty(PKGPATH:Mlang/gcc[5-9])
 .    if !empty(CC_VERSION:Mgcc-4.8*)
 .      include "../../lang/gcc48-libs/buildlink3.mk"
 .    elif !empty(CC_VERSION:Mgcc-4.9*)