Received: by mail.netbsd.org (Postfix, from userid 605) id 7A13684DCF; Fri, 2 Apr 2021 11:48:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id AD38884DCC for ; Fri, 2 Apr 2021 11:48:17 +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 t1jRC-5xD7Pg for ; Fri, 2 Apr 2021 11:48:17 +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 0B38584CDF for ; Fri, 2 Apr 2021 11:48:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id F3C20FA95; Fri, 2 Apr 2021 11:48:16 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1617364096120440" MIME-Version: 1.0 Date: Fri, 2 Apr 2021 11:48:16 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/mk/compiler To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210402114816.F3C20FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1617364096120440 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Fri Apr 2 11:48:16 UTC 2021 Modified Files: pkgsrc/mk/compiler: gcc.mk Log Message: mk: Remove references to gcc48/gcc49, as done elsewhere here To generate a diff of this commit: cvs rdiff -u -r1.220 -r1.221 pkgsrc/mk/compiler/gcc.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1617364096120440 Content-Disposition: inline Content-Length: 1080 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.220 pkgsrc/mk/compiler/gcc.mk:1.221 --- pkgsrc/mk/compiler/gcc.mk:1.220 Thu Feb 4 21:45:13 2021 +++ pkgsrc/mk/compiler/gcc.mk Fri Apr 2 11:48:16 2021 @@ -1,4 +1,4 @@ -# $NetBSD: gcc.mk,v 1.220 2021/02/04 21:45:13 gdt Exp $ +# $NetBSD: gcc.mk,v 1.221 2021/04/02 11:48:16 nia Exp $ # # This is the compiler definition for the GNU Compiler Collection. # @@ -978,11 +978,7 @@ PREPEND_PATH+= ${_GCC_DIR}/bin . if ${PKGPATH} != devel/libtool-base && ${PKGPATH} != devel/binutils && \ empty(PKGPATH:Mlang/gcc4?) && empty(PKGPATH:Mlang/gcc[5-9]) && \ empty(PKGPATH:Mlang/gcc10) -. if !empty(_GCC_PKGBASE:Mgcc48) -. include "../../lang/gcc48-libs/buildlink3.mk" -. elif !empty(_GCC_PKGBASE:Mgcc49) -. include "../../lang/gcc49-libs/buildlink3.mk" -. elif !empty(_GCC_PKGBASE:Mgcc5) +. if !empty(_GCC_PKGBASE:Mgcc5) . include "../../lang/gcc5-libs/buildlink3.mk" . elif !empty(_GCC_PKGBASE:Mgcc6) . include "../../lang/gcc6-libs/buildlink3.mk" --_----------=_1617364096120440--