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

move REPORT_PROBLEM to pkgpath.mk so that we can use it from bsd.port.mk

Browse Source 
as well.

Add the target to the default problem reporter.
Report problems while building dependencies.
This commit is contained in:
espie 2006-07-08 09:20:30 +00:00
parent edcca306ff
commit ee210c3e4e
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.750 2006/07/01 11:08:05 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.751 2006/07/08 09:20:30 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 $
#
@ -1462,6 +1462,7 @@ ${WRKDIR}/.${_DEP}${_i:C,[|:./<=>*],-,g}: ${_WRKDIR_COOKIE}
${ECHO_MSG} "===> Returning to build of ${FULLPKGNAME${SUBPACKAGE}}${_MASTER}"; \
else \
${ECHO_MSG} "===> Error in evaluating dependency ${_i}"; \
${REPORT_PROBLEM}; \
exit 1; \
fi; \
$$defaulted || pkg=`eval $$toset ${MAKE} _print-packagename`; \

9
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.72 2005/11/10 15:11:12 naddy Exp $
# $OpenBSD: bsd.port.subdir.mk,v 1.73 2006/07/08 09:20:30 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
@ -61,13 +61,6 @@ OPSYS= OpenBSD
ECHO_MSG?= echo
REPORT_PROBLEM_LOGFILE?=
.if !empty(REPORT_PROBLEM_LOGFILE)
REPORT_PROBLEM?=echo $$subdir >>${REPORT_PROBLEM_LOGFILE}
.else
REPORT_PROBLEM?=exit 1
.endif
# create a full list of SUBDIRS...
.if empty(PKGPATH)
_FULLSUBDIR:=${SUBDIR}

10
infrastructure/mk/pkgpath.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: pkgpath.mk,v 1.6 2005/11/03 19:32:25 espie Exp $
# $OpenBSD: pkgpath.mk,v 1.7 2006/07/08 09:20:30 espie Exp $
# pkgpath.mk - 2003 Marc Espie
# This file is in the public domain.
@ -77,3 +77,11 @@ _depfile_fragment= \
HTMLIFY= sed -e 's/&/\&amp;/g' -e 's/>/\&gt;/g' -e 's/</\&lt;/g'
REPORT_PROBLEM_LOGFILE?=
.if !empty(REPORT_PROBLEM_LOGFILE)
REPORT_PROBLEM?=echo "$$subdir ($@)">>${REPORT_PROBLEM_LOGFILE}
.else
REPORT_PROBLEM?=exit 1
.endif