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

add message that shows we exited a directory after an error, stops log there

Browse Source 
during rebuilds.
This commit is contained in:
espie 2007-08-25 07:56:04 +00:00
parent 809908acae
commit 7a9f1afb15
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
infrastructure/build/portslogger
View File

@ -1,6 +1,6 @@
#!/usr/bin/perl
# $OpenBSD: portslogger,v 1.13 2005/01/08 00:05:16 espie Exp $
# $OpenBSD: portslogger,v 1.14 2007/08/25 07:56:04 espie Exp $
# Copyright (c) 2001 Marc Espie. All rights reserved.
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -122,6 +122,11 @@ while (<>) {
$context = $ncontext;
$logfile = new Logger $context;
}
} elsif (m/^\=\=\=\> Exiting\s+(.*)\s+with an error$/) {
$ncontext = $1;
if ($ncontext eq $context) {
undef $context;
}
}
unless (defined $context) {
$context = default;

3
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.88 2007/07/08 17:57:56 espie Exp $
# $OpenBSD: bsd.port.subdir.mk,v 1.89 2007/08/25 07:56:04 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
@ -113,6 +113,7 @@ _subdir_fragment = \
${_flavor_fragment}; \
eval $${echo_msg} "===\> $$subdir"; \
if ! (eval $$toset exec ${MAKE} $$target); then \
eval $${echo_msg} "===\> Exiting $$subdir with an error"; \
${REPORT_PROBLEM}; \
fi; \
_STARTDIR_SEEN=true; \