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 /x11/tk | |
| 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 'x11/tk')
| -rw-r--r-- | x11/tk/buildlink3.mk | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk index ec956766e2c..6adfa0d6a14 100644 --- a/x11/tk/buildlink3.mk +++ b/x11/tk/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.22 2007/01/02 11:03:11 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:25:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TK_BUILDLINK3_MK:= ${TK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tk -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tk -.endif +.if !defined(TK_BUILDLINK3_MK) +TK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntk} -BUILDLINK_PACKAGES+= tk -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tk - -.if !empty(TK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tk+= tk>=8.4.6nb1 BUILDLINK_ABI_DEPENDS.tk+= tk>=8.4.12nb1 BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk @@ -25,10 +18,10 @@ BUILDLINK_TRANSFORM+= l:tk:tk84 BUILDLINK_TRANSFORM+= l:tk8.4:tk84 TKCONFIG_SH?= ${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh -.endif # TK_BUILDLINK3_MK .include "../../lang/tcl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" +.endif # TK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tk |