summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2020-02-20 16:31:12 +0000
committerMarc Espie <espie@cvs.openbsd.org>2020-02-20 16:31:12 +0000
commit1643ec7a58b32d569462dd8b6430bd453af3fc51 (patch)
tree0d35978eadbbf6d75080c14fa423b38c7eeefac6 /usr.sbin
parentdce9a999f09de001f0e2f9592b371383a9b2cb3d (diff)
make shell "with debug info" by default and add a bit of code to mark
stuff "no debug" eventually
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PackingElement.pm15
1 files changed, 10 insertions, 5 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
index e93d584ed38..8fa4a3147c3 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: PackingElement.pm,v 1.274 2019/11/10 16:43:11 espie Exp $
+# $OpenBSD: PackingElement.pm,v 1.275 2020/02/20 16:31:11 espie Exp $
#
# Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
#
@@ -361,6 +361,7 @@ sub write
{
my ($self, $fh) = @_;
print $fh "\@comment no checksum\n" if defined $self->{nochecksum};
+ print $fh "\@comment no debug\n" if defined $self->{nodebug};
$self->SUPER::write($fh);
if (defined $self->{d}) {
$self->{d}->write($fh);
@@ -393,6 +394,10 @@ sub destate
$self->{nochecksum} = 1;
undef $state->{nochecksum};
}
+ if (defined $state->{nodebug}) {
+ $self->{nodebug} = 1;
+ undef $state->{nodebug};
+ }
}
sub add_digest
@@ -455,6 +460,9 @@ sub check_digest
sub IsFile() { 1 }
+package OpenBSD::PackingElement::FileWithDebugInfo;
+our @ISA=qw(OpenBSD::PackingElement::FileBase);
+
package OpenBSD::PackingElement::File;
our @ISA=qw(OpenBSD::PackingElement::FileBase);
@@ -573,7 +581,7 @@ __PACKAGE__->register_with_factory;
sub dirclass() { "OpenBSD::PackingElement::Infodir" }
package OpenBSD::PackingElement::Shell;
-our @ISA=qw(OpenBSD::PackingElement::FileBase);
+our @ISA=qw(OpenBSD::PackingElement::FileWithDebugInfo);
sub keyword() { "shell" }
__PACKAGE__->register_with_factory;
@@ -660,9 +668,6 @@ sub format
return 1;
}
-package OpenBSD::PackingElement::FileWithDebugInfo;
-our @ISA=qw(OpenBSD::PackingElement::FileBase);
-
package OpenBSD::PackingElement::Lib;
our @ISA=qw(OpenBSD::PackingElement::FileWithDebugInfo);