[pkgsrc/trunk]: pkgsrc/lang bsd.compiler.mk no longer adds dependencies or in...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/aa237d750fc8
branches:  trunk
changeset: 467682:aa237d750fc8
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Feb 05 03:45:13 2004 +0000

description:
bsd.compiler.mk no longer adds dependencies or includes buildlink*.mk files
if it's being included by bsd.prefs.mk, so we can safely move the
BUILDLINK_DEPENDS line to its usual location.

diffstat:

 lang/gcc/buildlink3.mk       |  7 +++++--
 lang/gcc3-c++/buildlink3.mk  |  7 +++++--
 lang/gcc3-c/buildlink3.mk    |  7 +++++--
 lang/gcc3-f77/buildlink3.mk  |  7 +++++--
 lang/gcc3-java/buildlink3.mk |  7 +++++--
 lang/gcc3-objc/buildlink3.mk |  6 +++++-
 6 files changed, 30 insertions(+), 11 deletions(-)

diffs (141 lines):

diff -r 516247c1d283 -r aa237d750fc8 lang/gcc/buildlink3.mk
--- a/lang/gcc/buildlink3.mk    Thu Feb 05 03:42:32 2004 +0000
+++ b/lang/gcc/buildlink3.mk    Thu Feb 05 03:45:13 2004 +0000
@@ -1,13 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/05 00:28:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/02/05 03:45:13 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GCC_BUILDLINK3_MK:=    ${GCC_BUILDLINK3_MK}+
 
 .include "../../mk/bsd.prefs.mk"
 
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    gcc
+.endif
+
 .if !empty(GCC_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=           gcc
-BUILDLINK_DEPENDS+=            gcc
 BUILDLINK_DEPENDS.gcc+=                gcc>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc?=      ../../lang/gcc
 BUILDLINK_LIBDIRS.gcc?=                \
diff -r 516247c1d283 -r aa237d750fc8 lang/gcc3-c++/buildlink3.mk
--- a/lang/gcc3-c++/buildlink3.mk       Thu Feb 05 03:42:32 2004 +0000
+++ b/lang/gcc3-c++/buildlink3.mk       Thu Feb 05 03:45:13 2004 +0000
@@ -1,16 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/05 00:28:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/02/05 03:45:13 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GCC3CXX_BUILDLINK3_MK:=        ${GCC3CXX_BUILDLINK3_MK}+
 
 .include "../../mk/bsd.prefs.mk"
 
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    gcc3cxx
+.endif
+
 .if !empty(GCC3CXX_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 GCC3_PKGMODIF=                 _${GCC3_INSTALLTO_SUBPREFIX}
 .  endif
 BUILDLINK_PACKAGES+=           gcc3cxx
-BUILDLINK_DEPENDS+=            gcc3cxx
 BUILDLINK_DEPENDS.gcc3cxx+=    gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3cxx?=  ../../lang/gcc3-c++
 BUILDLINK_LIBDIRS.gcc3cxx?=    \
diff -r 516247c1d283 -r aa237d750fc8 lang/gcc3-c/buildlink3.mk
--- a/lang/gcc3-c/buildlink3.mk Thu Feb 05 03:42:32 2004 +0000
+++ b/lang/gcc3-c/buildlink3.mk Thu Feb 05 03:45:13 2004 +0000
@@ -1,16 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/05 00:28:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/02/05 03:45:13 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GCC3C_BUILDLINK3_MK:=  ${GCC3C_BUILDLINK3_MK}+
 
 .include "../../mk/bsd.prefs.mk"
 
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    gcc3c
+.endif
+
 .if !empty(GCC3C_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 GCC3_PKGMODIF=                 _${GCC3_INSTALLTO_SUBPREFIX}
 .  endif
 BUILDLINK_PACKAGES+=           gcc3c
-BUILDLINK_DEPENDS+=            gcc3c
 BUILDLINK_DEPENDS.gcc3c+=      gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3c?=    ../../lang/gcc3-c
 BUILDLINK_LIBDIRS.gcc3c?=      \
diff -r 516247c1d283 -r aa237d750fc8 lang/gcc3-f77/buildlink3.mk
--- a/lang/gcc3-f77/buildlink3.mk       Thu Feb 05 03:42:32 2004 +0000
+++ b/lang/gcc3-f77/buildlink3.mk       Thu Feb 05 03:45:13 2004 +0000
@@ -1,16 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/05 00:28:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/02/05 03:45:13 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GCC3F77_BUILDLINK3_MK:=        ${GCC3F77_BUILDLINK3_MK}+
 
 .include "../../mk/bsd.prefs.mk"
 
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    gcc3f77
+.endif
+
 .if !empty(GCC3F77_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 GCC3_PKGMODIF=                 _${GCC3_INSTALLTO_SUBPREFIX}
 .  endif
 BUILDLINK_PACKAGES+=           gcc3f77
-BUILDLINK_DEPENDS+=            gcc3f77
 BUILDLINK_DEPENDS.gcc3f77+=    gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3f77?=  ../../lang/gcc3-f77
 BUILDLINK_LIBDIRS.gcc3f77?=    \
diff -r 516247c1d283 -r aa237d750fc8 lang/gcc3-java/buildlink3.mk
--- a/lang/gcc3-java/buildlink3.mk      Thu Feb 05 03:42:32 2004 +0000
+++ b/lang/gcc3-java/buildlink3.mk      Thu Feb 05 03:45:13 2004 +0000
@@ -1,16 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/05 00:28:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/02/05 03:45:13 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 GCC3JAVA_BUILDLINK3_MK:=       ${GCC3JAVA_BUILDLINK3_MK}+
 
 .include "../../mk/bsd.prefs.mk"
 
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    gcc3java
+.endif
+
 .if !empty(GCC3JAVA_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 GCC3_PKGMODIF=                 _${GCC3_INSTALLTO_SUBPREFIX}
 .  endif
 BUILDLINK_PACKAGES+=           gcc3java
-BUILDLINK_DEPENDS+=            gcc3java
 BUILDLINK_DEPENDS.gcc3java+=   gcc3${GCC3_PKGMODIF}-java>=${_GCC_REQD}
 BUILDLINK_PKGSRCDIR.gcc3java?= ../../lang/gcc3-java
 BUILDLINK_LIBDIRS.gcc3java?=   \
diff -r 516247c1d283 -r aa237d750fc8 lang/gcc3-objc/buildlink3.mk
--- a/lang/gcc3-objc/buildlink3.mk      Thu Feb 05 03:42:32 2004 +0000
+++ b/lang/gcc3-objc/buildlink3.mk      Thu Feb 05 03:45:13 2004 +0000
@@ -1,10 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/05 00:28:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/02/05 03:45:13 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 GCC3OBJC_BUILDLINK3_MK:=       ${GCC3OBJC_BUILDLINK3_MK}+
 
 .include "../../mk/bsd.prefs.mk"
 
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    gcc3objc
+.endif
+
 .if !empty(GCC3OBJC_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 GCC3_PKGMODIF=                 _${GCC3_INSTALLTO_SUBPREFIX}