pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/compiler mk: Fix GCC PKGPATH matches.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/026d9b4c0153
branches:  trunk
changeset: 380861:026d9b4c0153
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed May 23 10:17:58 2018 +0000

description:
mk: Fix GCC PKGPATH matches.

diffstat:

 mk/compiler/gcc.mk |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r d1fdb4c4fc7a -r 026d9b4c0153 mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk        Wed May 23 09:59:33 2018 +0000
+++ b/mk/compiler/gcc.mk        Wed May 23 10:17:58 2018 +0000
@@ -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 @@
 # 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*)



Home | Main Index | Thread Index | Old Index