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 /sysutils/file | |
| 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 'sysutils/file')
| -rw-r--r-- | sysutils/file/buildlink3.mk | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/sysutils/file/buildlink3.mk b/sysutils/file/buildlink3.mk index a5d9c722d4e..99c0c8e35f8 100644 --- a/sysutils/file/buildlink3.mk +++ b/sysutils/file/buildlink3.mk @@ -1,26 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.7 2008/10/29 20:50:16 christos Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:24 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FILE_BUILDLINK3_MK:= ${FILE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= file -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= file -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfile} -BUILDLINK_PACKAGES+= file -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}file - -.if !empty(FILE_BUILDLINK3_MK:M+) +.if !defined(FILE_BUILDLINK3_MK) +FILE_BUILDLINK3_MK:= . include "../../mk/bsd.fast.prefs.mk" BUILDLINK_API_DEPENDS.file+= file>=4.17 BUILDLINK_ABI_DEPENDS.file+= file>=4.17 BUILDLINK_PKGSRCDIR.file?= ../../sysutils/file -.endif # FILE_BUILDLINK3_MK pkgbase := file .include "../../mk/pkg-build-options.mk" +.endif # FILE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -file |