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

While building a package, we check dependencies with

Browse Source 
DEPENDS_TARGET=package. Thus, the second check may fail...
So make it possible to avoid the second check.
This commit is contained in:
espie 2001-07-20 13:02:47 +00:00
parent f4bcd6a55e
commit 9f4e80ba55
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.425 2001/07/18 18:23:04 espie Exp $$
FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.426 2001/07/20 13:02:47 espie Exp $$
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
#
@ -1220,11 +1220,12 @@ MISC_DEPENDS=${DEPENDS:S/^/nonexistent::/}
# and the rules for the actual dependencies
_EARLY_EXIT?=false
.for _DEP in fetch build run lib misc
${_DEP}-depends:
. if defined(${_DEP:U}_DEPENDS) && ${NO_DEPENDS:L} == "no"
. for _i in ${${_DEP:U}_DEPENDS}
@unset PACKAGING DEPENDS_TARGET FLAVOR SUBPACKAGE || true; \
@unset _EARLY_EXIT PACKAGING DEPENDS_TARGET FLAVOR SUBPACKAGE || true; \
echo '${_i}'|{ \
IFS=:; read dep pkg dir target; \
case "X$$target" in X) target=${DEPENDS_TARGET};; esac; \
@ -1247,7 +1248,7 @@ ${_DEP}-depends:
found=false; \
case "$$dep" in \
"/nonexistent") earlyexit=true;; \
*) earlyexit=false; \
*) earlyexit=${_EARLY_EXIT}; \
${_${_DEP}_depends_fragment}; \
if $$found; then \
${ECHO_MSG} "===> ${FULLPKGNAME} depends on: $$dep - found"; \
@ -1707,7 +1708,7 @@ ${_FAKE_COOKIE}: ${_BUILD_COOKIE} ${WRKPKG}/mtree.spec
# The real install
${_INSTALL_COOKIE}: ${_PACKAGE_COOKIES}
@cd ${.CURDIR} && DEPENDS_TARGET=package exec ${MAKE} run-depends lib-depends
@cd ${.CURDIR} && DEPENDS_TARGET=package _EARLY_EXIT=true exec ${MAKE} run-depends lib-depends
@${ECHO_MSG} "===> Installing ${FULLPKGNAME} from ${PKGFILE}"
# Kludge
. if ${CONFIGURE_STYLE:Mimake}