[pkgsrc/trunk]: pkgsrc/mk Avoid circular dependency on gcc if USE_GCC[23] is ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a587fe032fea
branches:  trunk
changeset: 460130:a587fe032fea
user:      gavan <gavan%pkgsrc.org@localhost>
date:      Thu Aug 21 16:16:46 2003 +0000

description:
Avoid circular dependency on gcc if USE_GCC[23] is set.

diffstat:

 mk/bsd.prefs.mk      |  4 +++-
 mk/gcc.buildlink2.mk |  6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r fc002030c4c2 -r a587fe032fea mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Thu Aug 21 11:59:22 2003 +0000
+++ b/mk/bsd.prefs.mk   Thu Aug 21 16:16:46 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.119 2003/08/16 08:39:17 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.120 2003/08/21 16:16:46 gavan Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -309,6 +309,8 @@
 FILESDIR?=             ${.CURDIR}/files
 PKGDIR?=               ${.CURDIR}
 
+_PKGSRC_DEPS?=         # empty
+
 # If WRKOBJDIR is set, use that tree to build
 .if defined(WRKOBJDIR)
 BUILD_DIR?=            ${WRKOBJDIR}/${PKGPATH}
diff -r fc002030c4c2 -r a587fe032fea mk/gcc.buildlink2.mk
--- a/mk/gcc.buildlink2.mk      Thu Aug 21 11:59:22 2003 +0000
+++ b/mk/gcc.buildlink2.mk      Thu Aug 21 16:16:46 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.buildlink2.mk,v 1.4 2003/07/22 01:00:25 kristerw Exp $
+# $NetBSD: gcc.buildlink2.mk,v 1.5 2003/08/21 16:16:46 gavan Exp $
 #
 # USE_GCC2
 #      If defined, use gcc from lang/gcc.
@@ -11,9 +11,9 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(USE_GCC3) && empty(PKGPATH:Mlang/gcc3)
+.if defined(USE_GCC3) && empty(PKGPATH:Mlang/gcc3) && empty(_PKGSRC_DEPS:Mgcc-3.*)
 .  include "../lang/gcc3/buildlink2.mk"
-.elif defined(USE_GCC2) && empty(PKGPATH:Mlang/gcc)
+.elif defined(USE_GCC2) && empty(PKGPATH:Mlang/gcc) && empty(_PKGSRC_DEPS:Mgcc-2.*)
 .  include "../lang/gcc/buildlink2.mk"
 .endif