diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-12-31 13:12:28 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-12-31 13:12:28 +0000 |
| commit | 55e1c50d0ed5ac1843c1736a4e488693b76357b2 (patch) | |
| tree | c7d1a95859a94b6a67b8f9b3d699575b11d69d43 /usr.sbin/pkg_add | |
| parent | c66b4de2db9e6e60a1ee0f6a928c9c78fd9366e8 (diff) | |
complain if we see weird @libs (so, not in system).
optimization: for system libs, only parse stuff with .so in the name
Diffstat (limited to 'usr.sbin/pkg_add')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/SharedLibs.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm b/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm index b85d107c179..a6c873d7646 100644 --- a/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm +++ b/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: SharedLibs.pm,v 1.41 2009/12/17 11:57:02 espie Exp $ +# $OpenBSD: SharedLibs.pm,v 1.42 2009/12/31 13:12:27 espie Exp $ # # Copyright (c) 2003-2005 Marc Espie <espie@openbsd.org> # @@ -94,7 +94,11 @@ sub register_lib if (defined $stem) { push(@{$registered_libs->{$stem}->{$dir}->{$major}}, [$minor, $pkgname]); + } else { + print STDERR "Bogus library in $pkgname: $name\n" + unless $pkgname eq 'system'; } + } my $done_plist = {}; @@ -112,6 +116,7 @@ sub add_libs_from_system for my $dirname (system_dirs()) { opendir(my $dir, $destdir.$dirname."/lib") or next; while (my $d = readdir($dir)) { + next unless $d =~ m/\.so/; register_lib("$dirname/lib/$d", 'system'); } closedir($dir); |