diff options
author | jlam <jlam> | 2004-02-05 03:45:13 +0000 |
---|---|---|
committer | jlam <jlam> | 2004-02-05 03:45:13 +0000 |
commit | ea5dc77ca2487c9fbe78ca6d0aa97ce87906a6ff (patch) | |
tree | c0d99ef3b301ac304dc1b5f79f7af2185307b64d /lang | |
parent | 4748a8340ebfb41969fc6a45121d200121274176 (diff) | |
download | pkgsrc-ea5dc77ca2487c9fbe78ca6d0aa97ce87906a6ff.tar.gz |
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 (limited to 'lang')
-rw-r--r-- | lang/gcc/buildlink3.mk | 7 | ||||
-rw-r--r-- | lang/gcc3-c++/buildlink3.mk | 7 | ||||
-rw-r--r-- | lang/gcc3-c/buildlink3.mk | 7 | ||||
-rw-r--r-- | lang/gcc3-f77/buildlink3.mk | 7 | ||||
-rw-r--r-- | lang/gcc3-java/buildlink3.mk | 7 | ||||
-rw-r--r-- | lang/gcc3-objc/buildlink3.mk | 6 |
6 files changed, 30 insertions, 11 deletions
diff --git a/lang/gcc/buildlink3.mk b/lang/gcc/buildlink3.mk index ca1e7f77ec5..795bb8de46c 100644 --- a/lang/gcc/buildlink3.mk +++ b/lang/gcc/buildlink3.mk @@ -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 --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk index cfd01303a79..b3b4a6ce668 100644 --- a/lang/gcc3-c++/buildlink3.mk +++ b/lang/gcc3-c++/buildlink3.mk @@ -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 --git a/lang/gcc3-c/buildlink3.mk b/lang/gcc3-c/buildlink3.mk index 143abc8949c..0aa86178aae 100644 --- a/lang/gcc3-c/buildlink3.mk +++ b/lang/gcc3-c/buildlink3.mk @@ -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 --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk index 3007c932846..a2c431dd591 100644 --- a/lang/gcc3-f77/buildlink3.mk +++ b/lang/gcc3-f77/buildlink3.mk @@ -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 --git a/lang/gcc3-java/buildlink3.mk b/lang/gcc3-java/buildlink3.mk index 2c6721d07e4..034f0bd8d50 100644 --- a/lang/gcc3-java/buildlink3.mk +++ b/lang/gcc3-java/buildlink3.mk @@ -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 --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk index d0254073f37..1b431be0b36 100644 --- a/lang/gcc3-objc/buildlink3.mk +++ b/lang/gcc3-objc/buildlink3.mk @@ -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} |