CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Apr  8 09:12:47 UTC 2020

Modified Files:
        pkgsrc/lang/gcc6-aux: buildlink3.mk
        pkgsrc/lang/gcc7: buildlink3.mk
        pkgsrc/lang/gcc8: buildlink3.mk

Log Message:
lang/gcc*: Fix some obvious copy/paste errors.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/gcc6-aux/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc7/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc8/buildlink3.mk

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

Modified files:

Index: pkgsrc/lang/gcc6-aux/buildlink3.mk
diff -u pkgsrc/lang/gcc6-aux/buildlink3.mk:1.4 pkgsrc/lang/gcc6-aux/buildlink3.mk:1.5
--- pkgsrc/lang/gcc6-aux/buildlink3.mk:1.4      Sun Nov  3 19:04:00 2019
+++ pkgsrc/lang/gcc6-aux/buildlink3.mk  Wed Apr  8 09:12:46 2020
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.4 2019/11/03 19:04:00 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2020/04/08 09:12:46 jperkin Exp $
 
 BUILDLINK_TREE+=       gcc6-aux
 
-.if !defined(GCC5_AUX_BUILDLINK3_MK)
-GCC5_AUX_BUILDLINK3_MK:=
+.if !defined(GCC6_AUX_BUILDLINK3_MK)
+GCC6_AUX_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gcc6-aux+=       gcc6-aux>=20160822
 BUILDLINK_ABI_DEPENDS.gcc6-aux?=       gcc6-aux>=20160822nb1
@@ -17,7 +17,6 @@ BUILDLINK_DEPMETHOD.gcc6-aux?=                build
 
 pkgbase := gcc6-aux
 .include "../../mk/pkg-build-options.mk"
-
 .endif
 
 BUILDLINK_TREE+=       -gcc6-aux

Index: pkgsrc/lang/gcc7/buildlink3.mk
diff -u pkgsrc/lang/gcc7/buildlink3.mk:1.3 pkgsrc/lang/gcc7/buildlink3.mk:1.4
--- pkgsrc/lang/gcc7/buildlink3.mk:1.3  Mon Jul 23 01:07:08 2018
+++ pkgsrc/lang/gcc7/buildlink3.mk      Wed Apr  8 09:12:46 2020
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.3 2018/07/23 01:07:08 maya Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2020/04/08 09:12:46 jperkin Exp $
 
 BUILDLINK_TREE+=       gcc7
 
 .if !defined(GCC7_BUILDLINK3_MK)
-GCC6SNAPSHOT_BUILDLINK3_MK:=
+GCC7_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gcc7+=   gcc7>=${_GCC_REQD}
 BUILDLINK_ABI_DEPENDS.gcc7+=   gcc7>=7.0
@@ -12,18 +12,13 @@ BUILDLINK_DEPMETHOD.gcc7?=  build
 
 BUILDLINK_PASSTHRU_DIRS+=      ${BUILDLINK_PREFIX.gcc7}/gcc7
 
-BUILDLINK_FILES.gcc7=          #empty
+BUILDLINK_FILES.gcc7=          # empty
 BUILDLINK_AUTO_VARS.gcc7=      no
 
-# Packages that link against shared libraries need a full dependency.
-#.if defined(_USE_GCC_SHLIB)
-#DEPENDS+=     {gcc7, gcc7-libs}>=${_GCC_REQD}:../../lang/gcc7-libs
-#ABI_DEPENDS+= {gcc7,gcc7-libs}>=7.0:../../lang/gcc7-libs
-#.endif
-
 pkgbase := gcc7
 .include "../../mk/pkg-build-options.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.endif # gcc7_BUILDLINK3_MK
+.endif
+
 BUILDLINK_TREE+=       -gcc7

Index: pkgsrc/lang/gcc8/buildlink3.mk
diff -u pkgsrc/lang/gcc8/buildlink3.mk:1.3 pkgsrc/lang/gcc8/buildlink3.mk:1.4
--- pkgsrc/lang/gcc8/buildlink3.mk:1.3  Wed Apr  8 06:39:57 2020
+++ pkgsrc/lang/gcc8/buildlink3.mk      Wed Apr  8 09:12:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2020/04/08 06:39:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2020/04/08 09:12:46 jperkin Exp $
 
 BUILDLINK_TREE+=       gcc8
 
@@ -12,19 +12,13 @@ BUILDLINK_DEPMETHOD.gcc8?=  build
 
 BUILDLINK_PASSTHRU_DIRS+=      ${BUILDLINK_PREFIX.gcc8}/gcc8
 
-BUILDLINK_FILES.gcc8=          #empty
+BUILDLINK_FILES.gcc8=          # empty
 BUILDLINK_AUTO_VARS.gcc8=      no
 
-# Packages that link against shared libraries need a full dependency.
-#.if defined(_USE_GCC_SHLIB)
-#DEPENDS+=     {gcc8, gcc8-libs}>=${_GCC_REQD}:../../lang/gcc8-libs
-#ABI_DEPENDS+= {gcc8,gcc8-libs}>=8.0:../../lang/gcc8-libs
-#.endif
-
 pkgbase := gcc8
 .include "../../mk/pkg-build-options.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.endif # GCC8_BUILDLINK3_MK
+.endif
 
 BUILDLINK_TREE+=       -gcc8