summaryrefslogtreecommitdiff
path: root/lang/sun-jdk6
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2009-03-20 19:23:50 +0000
committerjoerg <joerg@pkgsrc.org>2009-03-20 19:23:50 +0000
commit2d1ba244e90207d03eef397a99aa4091baeec5b3 (patch)
tree647e974495c5d41703d41ca2e71c9b6063b9153a /lang/sun-jdk6
parent4bf0a20854ae9e07b7965977a713f2efee890976 (diff)
downloadpkgsrc-2d1ba244e90207d03eef397a99aa4091baeec5b3.tar.gz
Simply and speed up buildlink3.mk files and processing.
This changes the buildlink3.mk files to use an include guard for the recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS, BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of enter/exit marker, which can be used to reconstruct the tree and to determine first level includes. Avoiding := for large variables (BUILDLINK_ORDER) speeds up parse time as += has linear complexity. The include guard reduces system time by avoiding reading files over and over again. For complex packages this reduces both %user and %sys time to half of the former time.
Diffstat (limited to 'lang/sun-jdk6')
-rw-r--r--lang/sun-jdk6/buildlink3.mk21
1 files changed, 6 insertions, 15 deletions
diff --git a/lang/sun-jdk6/buildlink3.mk b/lang/sun-jdk6/buildlink3.mk
index f2ee33cb0e3..e64214c82d9 100644
--- a/lang/sun-jdk6/buildlink3.mk
+++ b/lang/sun-jdk6/buildlink3.mk
@@ -1,17 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/01/20 02:31:48 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:52 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-SUN_JDK6_BUILDLINK3_MK:= ${SUN_JDK6_BUILDLINK3_MK}+
+BUILDLINK_TREE+= sun-jdk6
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= sun-jdk6
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsun-jdk6}
-BUILDLINK_PACKAGES+= sun-jdk6
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jdk6
-
-.if !empty(SUN_JDK6_BUILDLINK3_MK:M+)
+.if !defined(SUN_JDK6_BUILDLINK3_MK)
+SUN_JDK6_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.sun-jdk6+= sun-jdk6-[0-9]*
BUILDLINK_ABI_DEPENDS.sun-jdk6?= sun-jdk6>=6.0.4
@@ -25,7 +17,6 @@ BUILDLINK_CPPFLAGS.sun-jdk6= \
-I${BUILDLINK_JAVA_PREFIX.sun-jre6}/include/linux
.include "../../lang/sun-jre6/buildlink3.mk"
+.endif # SUN_JDK6_BUILDLINK3_MK
-.endif # SUN_JDK6_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -sun-jdk6