diff options
| author | jlam <jlam@pkgsrc.org> | 2004-03-05 19:25:06 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-03-05 19:25:06 +0000 |
| commit | afe13927bc95790c8a1e766bddb44d489c029bcf (patch) | |
| tree | a3daf9a5fb572d8089372ce24f3f353d4bac8d47 /lang/gcc3-c++/buildlink3.mk | |
| parent | eadb7c0805bfa87d05e1bdde7c55dea0db0bd118 (diff) | |
| download | pkgsrc-afe13927bc95790c8a1e766bddb44d489c029bcf.tar.gz | |
Reorder location and setting of BUILDLINK_PACKAGES to match template
buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.
Diffstat (limited to 'lang/gcc3-c++/buildlink3.mk')
| -rw-r--r-- | lang/gcc3-c++/buildlink3.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk index cf84ea105eb..cdfbf09d26d 100644 --- a/lang/gcc3-c++/buildlink3.mk +++ b/lang/gcc3-c++/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/02/13 00:27:28 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:36 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GCC3CXX_BUILDLINK3_MK:= ${GCC3CXX_BUILDLINK3_MK}+ @@ -9,24 +9,27 @@ GCC3CXX_BUILDLINK3_MK:= ${GCC3CXX_BUILDLINK3_MK}+ BUILDLINK_DEPENDS+= gcc3cxx .endif +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc3cxx} +BUILDLINK_PACKAGES+= gcc3cxx + .if !empty(GCC3CXX_BUILDLINK3_MK:M+) . if defined(GCC3_INSTALLTO_SUBPREFIX) . if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" -GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} +GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} . endif . endif -BUILDLINK_PACKAGES+= gcc3cxx BUILDLINK_DEPENDS.gcc3cxx+= gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD} BUILDLINK_PKGSRCDIR.gcc3cxx?= ../../lang/gcc3-c++ BUILDLINK_LIBDIRS.gcc3cxx?= \ lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3cxx}\///} # Packages that link against shared libraries need a full dependency. -. if defined(USE_GCC_SHLIB) +.if defined(USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc3cxx+= full -. else +.else BUILDLINK_DEPMETHOD.gcc3cxx?= build -. endif +.endif + .endif # GCC3CXX_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |