remove XXX: even though they're all the same, build-debug-info

processes base separately for each subpackage
This commit is contained in:
espie 2022-09-11 08:03:08 +00:00
parent 2ba447246c
commit d80da21425

View File

@ -1,5 +1,5 @@
#! /usr/bin/perl
# $OpenBSD: build-debug-info,v 1.44 2022/09/11 08:00:37 espie Exp $
# $OpenBSD: build-debug-info,v 1.45 2022/09/11 08:03:08 espie Exp $
# Copyright (c) 2019 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
@ -238,7 +238,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.44 2022/09/11 08:00:37 espie Exp $
# Makefile generated by build-debug-info $OpenBSD: build-debug-info,v 1.45 2022/09/11 08:03:08 espie Exp $
# No serviceable parts
# Intended to run under the stage area after cd ${WRKINST}
@ -269,9 +269,8 @@ EOPREAMBLE
# but they will contain the right information
$self->{linkstash} = {};
$self->{ostash} = {};
# XXX we assume all subpackage are under the same destdir (-B option)
my $base = $self->{lists}[0]->{state}{base};
for my $l (@{$self->{lists}}) {
my $base = $l->{state}{base};
$self->{empty} = 1;
$self->{dirstash} = {};
$self->{prefix} = $base."/".$l->{state}{prefix};