Received: by mail.netbsd.org (Postfix, from userid 605) id C99DC84DA3; Tue, 9 Oct 2018 15:02:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D2D9184D9B for ; Tue, 9 Oct 2018 15:02:49 +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 0_bvtmkq2q8f for ; Tue, 9 Oct 2018 15:02:49 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2715C84CD6 for ; Tue, 9 Oct 2018 15:02:49 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1922AFBEE; Tue, 9 Oct 2018 15:02:49 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1539097369119700" MIME-Version: 1.0 Date: Tue, 9 Oct 2018 15:02:49 +0000 From: "David Brownlee" Subject: CVS commit: pkgsrc/mk/compiler To: pkgsrc-changes@NetBSD.org Reply-To: abs@netbsd.org X-Mailer: log_accum Message-Id: <20181009150249.1922AFBEE@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. --_----------=_1539097369119700 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: abs Date: Tue Oct 9 15:02:49 UTC 2018 Modified Files: pkgsrc/mk/compiler: gcc.mk Log Message: Support single digit GCC_REQ values (5, 6 or 7) Do not add 4 to avoid confusion between gcc44/48/49 Also switch USE_PKGSRC_GCC_RUNTIME checks to use _GCC_PKGBASE to match against selected gcc To generate a diff of this commit: cvs rdiff -u -r1.194 -r1.195 pkgsrc/mk/compiler/gcc.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1539097369119700 Content-Disposition: inline Content-Length: 1931 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.194 pkgsrc/mk/compiler/gcc.mk:1.195 --- pkgsrc/mk/compiler/gcc.mk:1.194 Mon Oct 8 20:02:17 2018 +++ pkgsrc/mk/compiler/gcc.mk Tue Oct 9 15:02:48 2018 @@ -1,4 +1,4 @@ -# $NetBSD: gcc.mk,v 1.194 2018/10/08 20:02:17 rillig Exp $ +# $NetBSD: gcc.mk,v 1.195 2018/10/09 15:02:48 abs Exp $ # # This is the compiler definition for the GNU Compiler Collection. # @@ -134,13 +134,13 @@ _GCC48_PATTERNS= 4.[5-8] 4.[5-8].* _GCC49_PATTERNS= 4.9 4.9.* # _GCC5_PATTERNS matches N s.t. 5.0 <= N < 6. -_GCC5_PATTERNS= 5.* +_GCC5_PATTERNS= 5 5.* # _GCC6_PATTERNS matches N s.t. 6.0 <= N < 7. -_GCC6_PATTERNS= 6.* +_GCC6_PATTERNS= 6 6.* # _GCC7_PATTERNS matches N s.t. 7.0 <= N < 8. -_GCC7_PATTERNS= 7.* +_GCC7_PATTERNS= 7 7.* # _GCC_AUX_PATTERNS matches 8-digit date YYYYMMDD* _GCC_AUX_PATTERNS= 20[1-2][0-9][0-1][0-9][0-3][0-9]* @@ -907,15 +907,15 @@ PREPEND_PATH+= ${_GCC_DIR}/bin # Special case packages which are themselves a dependency of gcc runtime. . 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*) +. if !empty(_GCC_PKGBASE:Mgcc48) . include "../../lang/gcc48-libs/buildlink3.mk" -. elif !empty(CC_VERSION:Mgcc-4.9*) +. elif !empty(_GCC_PKGBASE:Mgcc49) . include "../../lang/gcc49-libs/buildlink3.mk" -. elif !empty(CC_VERSION:Mgcc-5.*) +. elif !empty(_GCC_PKGBASE:Mgcc5) . include "../../lang/gcc5-libs/buildlink3.mk" -. elif !empty(CC_VERSION:Mgcc-6.*) +. elif !empty(_GCC_PKGBASE:Mgcc6) . include "../../lang/gcc6-libs/buildlink3.mk" -. elif !empty(CC_VERSION:Mgcc-7.*) +. elif !empty(_GCC_PKGBASE:Mgcc7) . include "../../lang/gcc7-libs/buildlink3.mk" . else PKG_FAIL_REASON+= "No USE_PKGSRC_GCC_RUNTIME support for ${CC_VERSION}" --_----------=_1539097369119700--