summaryrefslogtreecommitdiff
path: root/lang/gcc3-java
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-03-05 19:25:06 +0000
committerjlam <jlam@pkgsrc.org>2004-03-05 19:25:06 +0000
commit9ff0e10340db36b9d69d9c894831dee901dd82e7 (patch)
treea3daf9a5fb572d8089372ce24f3f353d4bac8d47 /lang/gcc3-java
parent07634a03fa5b47f44a90b982d8294e55a2d3dd01 (diff)
downloadpkgsrc-9ff0e10340db36b9d69d9c894831dee901dd82e7.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-java')
-rw-r--r--lang/gcc3-java/buildlink3.mk15
1 files changed, 9 insertions, 6 deletions
diff --git a/lang/gcc3-java/buildlink3.mk b/lang/gcc3-java/buildlink3.mk
index d09fdcf927b..43fa2995708 100644
--- a/lang/gcc3-java/buildlink3.mk
+++ b/lang/gcc3-java/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}+
GCC3JAVA_BUILDLINK3_MK:= ${GCC3JAVA_BUILDLINK3_MK}+
@@ -9,24 +9,27 @@ GCC3JAVA_BUILDLINK3_MK:= ${GCC3JAVA_BUILDLINK3_MK}+
BUILDLINK_DEPENDS+= gcc3java
.endif
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc3java}
+BUILDLINK_PACKAGES+= gcc3java
+
.if !empty(GCC3JAVA_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+= gcc3java
BUILDLINK_DEPENDS.gcc3java+= gcc3${GCC3_PKGMODIF}-java>=${_GCC_REQD}
BUILDLINK_PKGSRCDIR.gcc3java?= ../../lang/gcc3-java
BUILDLINK_LIBDIRS.gcc3java?= \
lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3java}\///}
# Packages that link against shared libraries need a full dependency.
-. if defined(USE_GCC_SHLIB)
+.if defined(USE_GCC_SHLIB)
BUILDLINK_DEPMETHOD.gcc3java+= full
-. else
+.else
BUILDLINK_DEPMETHOD.gcc3java?= build
-. endif
+.endif
+
.endif # GCC3JAVA_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}