diff options
| author | sbd <sbd> | 2010-05-19 09:12:15 +0000 |
|---|---|---|
| committer | sbd <sbd> | 2010-05-19 09:12:15 +0000 |
| commit | 528426619e5b236fe4f5d6f58c56ff68a6922aae (patch) | |
| tree | 655898d2a56fe6f792580d4592fcf0753b311a74 /mk | |
| parent | c3bbed790a6f84f98c629a3d038c1ba5159e1147 (diff) | |
| download | pkgsrc-528426619e5b236fe4f5d6f58c56ff68a6922aae.tar.gz | |
Add BUILTIN_PKGS with the "builtin" package names to the build information.
E.g if readline 6.0 and ncurses 5.7 are part of the system we get:
BUILTIN_PKGS=readline-6.0 ncurses-5.7
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 13 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 3 | ||||
| -rw-r--r-- | mk/buildlink3/bsd.builtin.mk | 5 |
3 files changed, 18 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index e9efa74f38c..d70fff3d588 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1970 2010/04/30 08:14:04 sbd Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1971 2010/05/19 09:12:15 sbd Exp $ # # This file is in the public domain. # @@ -519,6 +519,17 @@ _BUILD_DEFS+= OSVERSION_SPECIFIC DEPENDS+= osabi-${OPSYS}-${OS_VERSION}:../../pkgtools/osabi .endif # OSVERSION_SPECIFIC +.for _pkg_ in ${_BUILTIN_PKGS} +. if defined(USE_BUILTIN.${_pkg_}) && \ + !empty(USE_BUILTIN.${_pkg_}:M[yY][eE][sS]) && \ + defined(BUILTIN_PKG.${_pkg_}) && !empty(BUILTIN_PKG.${_pkg_}) +BUILTIN_PKGS+= ${BUILTIN_PKG.${_pkg_}} +. endif +.endfor +.if defined(BUILTIN_PKGS) +_BUILD_DEFS+= BUILTIN_PKGS +.endif + .PHONY: all .if !target(all) all: ${_PKGSRC_BUILD_TARGETS} diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 71eb919a6fb..3093b846b93 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.309 2010/04/30 03:29:55 sbd Exp $ +# $NetBSD: bsd.prefs.mk,v 1.310 2010/05/19 09:12:15 sbd Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -637,6 +637,7 @@ FILESDIR?= ${.CURDIR}/files PKGDIR?= ${.CURDIR} _PKGSRC_DEPS?= # empty +_BUILTIN_PKGS?= # empty # If WRKOBJDIR is set, use that tree to build .if defined(WRKOBJDIR) diff --git a/mk/buildlink3/bsd.builtin.mk b/mk/buildlink3/bsd.builtin.mk index 578c84b81f4..7469253d9a7 100644 --- a/mk/buildlink3/bsd.builtin.mk +++ b/mk/buildlink3/bsd.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.builtin.mk,v 1.10 2009/03/20 19:25:01 joerg Exp $ +# $NetBSD: bsd.builtin.mk,v 1.11 2010/05/19 09:12:15 sbd Exp $ # # Copyright (c) 2004-2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -147,6 +147,9 @@ _BLTN_PREFER.${_pkg_}= native _BLTN_PREFER.${_pkg_}= pkgsrc . endif PREFER.${_pkg_}?= ${_BLTN_PREFER.${_pkg_}} +. if empty(_BUILTIN_PKGS:M${_pkg_}) +_BUILTIN_PKGS+= ${_pkg_} +. endif .endfor .include "../../mk/buildlink3/find-libs.mk" |