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

this actually broke only @option no-default-conflict

Browse Source 
somewhat obviously.

sorry, didn't test on a port with this active.
This commit is contained in:
espie 2022-03-09 23:17:31 +00:00
parent 6c147faf87
commit ee08de4c0c
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
infrastructure/bin/build-debug-info
View File

@ -1,5 +1,5 @@
#! /usr/bin/perl
# $OpenBSD: build-debug-info,v 1.41 2022/03/09 20:19:23 naddy Exp $
# $OpenBSD: build-debug-info,v 1.42 2022/03/09 23:17:31 espie Exp $
# Copyright (c) 2019 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
@ -74,13 +74,6 @@ sub write_debug_info
{
}
package OpenBSD::PackingElement::CVSTag;
sub write_debug_info
{
my ($self, $fh, $o) = @_;
$self->write($fh);
}
package OpenBSD::PackingElement::PkgPath;
sub write_debug_info
{
@ -180,7 +173,8 @@ sub write_debug_info
package OpenBSD::PackingElement::NoDefaultConflict;
sub write_debug_info
{
&OpenBSD::PackingElement::CVSTag::write_debug_info;
my ($self, $fh, $o) = @_;
$self->write($fh);
}
package OpenBSD::PackingElement::Conflict;
@ -236,7 +230,7 @@ PlistReader->parse_args($self);
use File::Basename;
$self->{mk} = $state->openfile($state->{pkgdir}."/Makefile.new");
print {$self->{mk}} << 'EOPREAMBLE';
# Makefile generated by build-debug-info $OpenBSD: build-debug-info,v 1.41 2022/03/09 20:19:23 naddy Exp $
# Makefile generated by build-debug-info $OpenBSD: build-debug-info,v 1.42 2022/03/09 23:17:31 espie Exp $
# No serviceable parts
# Intended to run under the stage area after cd ${WRKINST}