Received: by mail.netbsd.org (Postfix, from userid 605) id 9CE2884DBC; Wed, 23 May 2018 10:17:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1EE2F84D9D for ; Wed, 23 May 2018 10:17:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id BgDnIjFY-dhZ for ; Wed, 23 May 2018 10:17:58 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7275884D69 for ; Wed, 23 May 2018 10:17:58 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6B1F7FBEC; Wed, 23 May 2018 10:17:58 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1527070678295330" MIME-Version: 1.0 Date: Wed, 23 May 2018 10:17:58 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/mk/compiler To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20180523101758.6B1F7FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1527070678295330 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1527070678295330 Content-Disposition: inline Content-Length: 1132 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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*) --_----------=_1527070678295330--