diff options
| author | joerg <joerg@pkgsrc.org> | 2009-03-20 19:23:50 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-03-20 19:23:50 +0000 |
| commit | 2d1ba244e90207d03eef397a99aa4091baeec5b3 (patch) | |
| tree | 647e974495c5d41703d41ca2e71c9b6063b9153a /lang/jdk | |
| parent | 4bf0a20854ae9e07b7965977a713f2efee890976 (diff) | |
| download | pkgsrc-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/jdk')
| -rw-r--r-- | lang/jdk/buildlink3.mk | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/lang/jdk/buildlink3.mk b/lang/jdk/buildlink3.mk index 95204f03a7a..3cecc7943ca 100644 --- a/lang/jdk/buildlink3.mk +++ b/lang/jdk/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:55 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -JDK_BUILDLINK3_MK:= ${JDK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= jdk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= jdk -.endif +.if !defined(JDK_BUILDLINK3_MK) +JDK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njdk} -BUILDLINK_PACKAGES+= jdk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jdk - -.if !empty(JDK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.jdk+= jdk>=1.1.8 BUILDLINK_PKGSRCDIR.jdk?= ../../lang/jdk BUILDLINK_JAVA_PREFIX.jdk= ${PREFIX}/java/jdk-1.1.8 @@ -21,6 +14,6 @@ BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_JAVA_PREFIX.jdk} BUILDLINK_CPPFLAGS.jdk= \ -I${BUILDLINK_JAVA_PREFIX.jdk}/include \ -I${BUILDLINK_JAVA_PREFIX.jdk}/include/netbsd -.endif # JDK_BUILDLINK3_MK +.endif # JDK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -jdk |