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

tweak the flavor_fragment stuff to be able to specify "hey, if there's no

Browse Source 
flavor, it means it's empty and not the default one". Useful for tools
that reuse saved fullpkgpaths.
This commit is contained in:
espie 2011-09-24 07:36:02 +00:00
parent b7a45e0bc3
commit a08bf6b41e
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
infrastructure/mk/bsd.port.subdir.mk
View File

@ -1,7 +1,7 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
# $OpenBSD: bsd.port.subdir.mk,v 1.99 2011/03/20 19:28:07 espie Exp $
# $OpenBSD: bsd.port.subdir.mk,v 1.100 2011/09/24 07:36:03 espie Exp $
# FreeBSD Id: bsd.port.subdir.mk,v 1.20 1997/08/22 11:16:15 asami Exp
#
# The include file <bsd.port.subdir.mk> contains the default targets
@ -59,6 +59,13 @@ ARCH ?!= uname -m
ECHO_MSG ?= echo
FULLPATH ?= No
.if ${FULLPATH:L} == "yes"
_FULLPATH = true
.else
_FULLPATH = false
.endif
# create a full list of SUBDIRS...
.if empty(PKGPATH)
_FULLSUBDIR := ${SUBDIR}
@ -103,6 +110,7 @@ _subdir_fragment = \
_STARTDIR_SEEN=${_STARTDIR_SEEN}; \
unset SUBDIR SUBDIRLIST || true; \
export _STARTDIR_SEEN; \
_fullpath=${_FULLPATH}; \
for subdir in ${_FULLSUBDIR:QL}; do \
if ! $${_STARTDIR_SEEN}; then \
case "${STARTDIR}" in \
@ -115,7 +123,7 @@ _subdir_fragment = \
esac; \
fi; \
${_SKIP_STUFF}; \
if ${_flavor_fragment}; then \
if ${_pflavor_fragment}; then \
eval $${echo_msg} "===\> $$subdir"; \
if ! (eval $$toset exec ${MAKE} $$target); then \
eval $${echo_msg} "===\> Exiting $$subdir with an error"; \

8
infrastructure/mk/pkgpath.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: pkgpath.mk,v 1.35 2011/03/28 00:16:13 fgsch Exp $
# $OpenBSD: pkgpath.mk,v 1.36 2011/09/24 07:36:02 espie Exp $
# ex:ts=4 sw=4 filetype=make:
# pkgpath.mk - 2003 Marc Espie
# This file is in the public domain.
@ -28,9 +28,9 @@ PKGDEPTH = ${PKGPATH:C|[^./][^/]*|..|g}/
# Code to invoke to split dir,-multi,flavor
_flavor_fragment = \
_pflavor_fragment = \
unset FLAVOR SUBPACKAGE || true; \
multi=''; flavor=''; space=''; sawflavor=false; \
multi=''; flavor=''; space=''; sawflavor=$${_fullpath}; \
reported=false; found_dir=false; \
case "$$subdir" in \
"") \
@ -84,6 +84,8 @@ _flavor_fragment = \
echo 1>&2 ">> Broken dependency: $$dir non existent $$extra_msg"; \
$$found_dir
_flavor_fragment = _fullpath=false; ${_pflavor_fragment}
_depfile_fragment = \
case X$${_DEPENDS_FILE} in \
X) _DEPENDS_FILE=`mktemp /tmp/depends.XXXXXXXXX|| exit 1`; \