CVS log for pkgsrc/x11/fixesproto/buildlink3.mk

Up to [NetBSD + pkgsrc-wip] / pkgsrc / x11 / fixesproto

Request diff between arbitrary revisions - Display revisions graphically

Keyword substitution: kv
Default branch: MAIN

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.

Unbreak build of a lot of X11 packages on systems which use native X11
(e.g. NetBSD with bundled XFree86). Checking whether "X11_TYPE" is "xorg"
is obsolete and *not* equivalent to checking whether we are not using
modular X.org.

Since X11_TYPE cannot be "xorg", there's no point in checking for that
condition. What was really meant is X11_TYPE != "modular".

Replace mk/bsd.prefs.mk includes with bsd.fast.prefs.mk includes.
The redundant parsing of bsd.prefs.mk is mostly avoided now and
parse time e.g. for x11/kdebase3 gets reduced by up to 10%.

Don't use the builtin framework for the various Xorg components
when X11_TYPE=xorg. Let them include x11.buildlink3.mk directly.
Remove the manual USE_BUILTIN declarations from xorg-libs/b3.mk.
This fixes a symmetry in the dependency list depending on whether
xorg-libs is installed already or not.

Discussed with jlam@

Change the format of BUILDLINK_ORDER to contain depth information as well,
and add a new helper target and script, "show-buildlink3", that outputs
a listing of the buildlink3.mk files included as well as the depth at
which they are included.

For example, "make show-buildlink3" in fonts/Xft2 displays:

	zlib
	fontconfig
	    iconv
	    zlib
	    freetype2
	    expat
	freetype2
	Xrender
	    renderproto

Track information in a new variable BUILDLINK_ORDER that informs us
of the order in which buildlink3.mk files are (recursively) included
by a package Makefile.

Import fixesproto from pkgsrc-wip.

This will replace the fixesext package.

This provides the Fixes extension headers from modular X.org X11
project.

Initial revision