cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pseudo-flavors *must* be taken off MULTI_PACKAGES, not BUILD_PACKAGES.

Browse Source 
dpb coalesces build dependencies over MULTI_PACKAGES: if we don't substract
from MULTI_PACKAGES, this can lead to bootstrap loops.

Case in point: sysutils/gamin, whose build relies on "no_server" to be
available as a dependency for glib2/gtk+2.

(but IGNORED stuff is properly kept as MULTI_PACKAGES, since it's mostly
intended to avoid strange arch errors)
This commit is contained in:
espie 2011-10-03 08:35:36 +00:00
parent bcef340055
commit f9a48d816a
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
infrastructure/mk/bsd.port.arch.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: bsd.port.arch.mk,v 1.3 2011/09/28 13:54:20 espie Exp $
# $OpenBSD: bsd.port.arch.mk,v 1.4 2011/10/03 08:35:36 espie Exp $
#
# ex:ts=4 sw=4 filetype=make:
#
@ -53,6 +53,17 @@ SUBPACKAGE ?= -
SUBPACKAGE ?= -main
.endif
# allow pseudo-flavors to make subpackages vanish.
.if defined(FLAVOR)
. for _S in ${MULTI_PACKAGES}
. for _T in ${_S:S/^-/no_/}
. if ${FLAVOR:L:M${_T}}
MULTI_PACKAGES := ${MULTI_PACKAGES:N${_S}}
. endif
. endfor
. endfor
.endif
# build the actual list of subpackages we want
BUILD_PACKAGES =
@ -105,13 +116,3 @@ BUILD_PACKAGES += ${_s}
. endif
.endfor
# allow pseudo-flavors to make subpackages vanish.
.if defined(FLAVOR)
. for _S in ${BUILD_PACKAGES}
. for _T in ${_S:S/^-/no_/}
. if ${FLAVOR:L:M${_T}}
BUILD_PACKAGES := ${BUILD_PACKAGES:N${_S}}
. endif
. endfor
. endfor
.endif