summaryrefslogtreecommitdiffstats
path: root/usr.sbin/pkg_add
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2019-11-10 16:43:11 +0000
committerespie <espie@openbsd.org>2019-11-10 16:43:11 +0000
commit67182e2f933cd9bdf1f801bbae5521deba7da257 (patch)
tree4ca0f0749887faf62d6488be2675f0578205f45c /usr.sbin/pkg_add
parentuse $(<file) instead of $(cat file) since this script uses ksh; ok ajacoutot@ (diff)
downloadwireguard-openbsd-67182e2f933cd9bdf1f801bbae5521deba7da257.tar.xz
wireguard-openbsd-67182e2f933cd9bdf1f801bbae5521deba7da257.zip
tweaks to the file hierarchy to annotate anything with debuginfo, so
existing @bin @lib and new @static-lib @so as discussed with p2k19 people
Diffstat (limited to 'usr.sbin/pkg_add')
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PackingElement.pm31
1 files changed, 23 insertions, 8 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
index 27f9f100b02..e93d584ed38 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.273 2019/11/10 14:22:53 espie Exp $
+# $OpenBSD: PackingElement.pm,v 1.274 2019/11/10 16:43:11 espie Exp $
#
# Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
#
@@ -660,9 +660,12 @@ sub format
return 1;
}
-package OpenBSD::PackingElement::Lib;
+package OpenBSD::PackingElement::FileWithDebugInfo;
our @ISA=qw(OpenBSD::PackingElement::FileBase);
+package OpenBSD::PackingElement::Lib;
+our @ISA=qw(OpenBSD::PackingElement::FileWithDebugInfo);
+
our $todo = 0;
sub keyword() { "lib" }
@@ -686,6 +689,24 @@ sub parse
sub is_a_library() { 1 }
+package OpenBSD::PackingElement::Binary;
+our @ISA=qw(OpenBSD::PackingElement::FileWithDebugInfo);
+
+sub keyword() { "bin" }
+__PACKAGE__->register_with_factory;
+
+package OpenBSD::PackingElement::StaticLib;
+our @ISA=qw(OpenBSD::PackingElement::FileWithDebugInfo);
+
+sub keyword() { "static-lib" }
+__PACKAGE__->register_with_factory;
+
+package OpenBSD::PackingElement::SharedObject;
+our @ISA=qw(OpenBSD::PackingElement::FileWithDebugInfo);
+
+sub keyword() { "so" }
+__PACKAGE__->register_with_factory;
+
package OpenBSD::PackingElement::PkgConfig;
our @ISA=qw(OpenBSD::PackingElement::FileBase);
@@ -698,12 +719,6 @@ our @ISA=qw(OpenBSD::PackingElement::FileBase);
sub keyword() { "ltlib" }
__PACKAGE__->register_with_factory;
-package OpenBSD::PackingElement::Binary;
-our @ISA=qw(OpenBSD::PackingElement::FileBase);
-
-sub keyword() { "bin" }
-__PACKAGE__->register_with_factory;
-
# Comment is very special
package OpenBSD::PackingElement::Comment;
our @ISA=qw(OpenBSD::PackingElement::Meta);