diff options
| author | joerg <joerg> | 2009-03-20 19:23:50 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2009-03-20 19:23:50 +0000 |
| commit | 75fb5bb7e7604eb9547fecf17d31c5f8f7bc55fd (patch) | |
| tree | 647e974495c5d41703d41ca2e71c9b6063b9153a /security/tcp_wrappers | |
| parent | 1e5847233e0f63b08e108a58553ab24d554cda0f (diff) | |
| download | pkgsrc-75fb5bb7e7604eb9547fecf17d31c5f8f7bc55fd.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 'security/tcp_wrappers')
| -rw-r--r-- | security/tcp_wrappers/buildlink3.mk | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/security/tcp_wrappers/buildlink3.mk b/security/tcp_wrappers/buildlink3.mk index 5776176e524..caf277f634a 100644 --- a/security/tcp_wrappers/buildlink3.mk +++ b/security/tcp_wrappers/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.13 2006/12/12 21:52:37 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:23 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TCP_WRAPPERS_BUILDLINK3_MK:= ${TCP_WRAPPERS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tcp_wrappers -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tcp_wrappers -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcp_wrappers} -BUILDLINK_PACKAGES+= tcp_wrappers -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcp_wrappers +.if !defined(TCP_WRAPPERS_BUILDLINK3_MK) +TCP_WRAPPERS_BUILDLINK3_MK:= -.if !empty(TCP_WRAPPERS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tcp_wrappers+= tcp_wrappers>=7.6.1nb1 BUILDLINK_ABI_DEPENDS.tcp_wrappers+= tcp_wrappers>=7.6.1nb3 BUILDLINK_PKGSRCDIR.tcp_wrappers?= ../../security/tcp_wrappers -.endif # TCP_WRAPPERS_BUILDLINK3_MK # need libnsl and libsocket to link into an executable on Solaris. .include "../../mk/bsd.fast.prefs.mk" @@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.tcp_wrappers?= ../../security/tcp_wrappers BUILDLINK_LDADD.tcp_wrappers+= -lnsl -lsocket BUILDLINK_LDFLAGS.tcp_wrappers?= ${BUILDLINK_LDADD.tcp_wrappers} .endif +.endif # TCP_WRAPPERS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tcp_wrappers |