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 | 022c4606fcc3bd0780b781561db11a457e1b2757 (patch) | |
| tree | 647e974495c5d41703d41ca2e71c9b6063b9153a /x11/libX11 | |
| parent | df774e13d463dae87662491d7021d1153d110ece (diff) | |
| download | pkgsrc-022c4606fcc3bd0780b781561db11a457e1b2757.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/libX11')
| -rw-r--r-- | x11/libX11/buildlink3.mk | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/x11/libX11/buildlink3.mk b/x11/libX11/buildlink3.mk index 4f1848035d1..7fabade9f01 100644 --- a/x11/libX11/buildlink3.mk +++ b/x11/libX11/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2007/12/15 15:21:53 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:43 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,31 +6,24 @@ .include "../../mk/x11.buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBX11_BUILDLINK3_MK:= ${LIBX11_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libX11 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libX11 -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibX11} -BUILDLINK_PACKAGES+= libX11 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libX11 +.if !defined(LIBX11_BUILDLINK3_MK) +LIBX11_BUILDLINK3_MK:= -.if ${LIBX11_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libX11+= libX11>=1.1 BUILDLINK_ABI_DEPENDS.libX11+= libX11>=0.99 BUILDLINK_PKGSRCDIR.libX11?= ../../x11/libX11 X11_LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib X11_LDFLAGS+= -L${BUILDLINK_PREFIX.libX11}/lib -.endif # LIBX11_BUILDLINK3_MK .include "../../x11/kbproto/buildlink3.mk" .include "../../x11/libXau/buildlink3.mk" .include "../../x11/libXdmcp/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" +.endif # LIBX11_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libX11 .endif |