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

unify ldd/objdump runs somewhat

Browse Source 
tweak FileSource to return its directory separately from the filename,
so that running objdump does a chdir
adjust filename to be a relative path.
This commit is contained in:
espie 2011-11-27 11:29:33 +00:00
parent 9e968f07f3
commit 5b1516ea0b
2 changed files with 25 additions and 13 deletions
infrastructure
bin
check-lib-depends
lib/OpenBSD
FileSource.pm

26
infrastructure/bin/check-lib-depends

@ -1,6 +1,6 @@
#!/usr/bin/perl
# $OpenBSD: check-lib-depends,v 1.13 2011/11/26 12:02:54 espie Exp $
# $OpenBSD: check-lib-depends,v 1.14 2011/11/27 11:29:33 espie Exp $
# Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
@ -94,15 +94,22 @@ sub find_libs
sub run_objdump
{
my ($state, $n) = @_;
my ($state, $source, $item) = @_;
my $cmd;
if ($state->{old}) {
open($cmd, "-|", "ldd", "-f", "NEEDED lib%o.so.%m.%n\n", $n) or
$state->fatal("run ldd: #1", $!);
} else {
unless (open($cmd, '-|')) {
open(STDERR, '>', '/dev/null');
my $n = $source->retrieve($state, $item);
# make sure to turn into a relative path
$n =~ s/^\/*//;
unless (open($cmd, '-|')) {
chdir($source->directory) or
$state->fatal("Bad directory #1: #2",
$source->directory, $!);
open(STDERR, '>', '/dev/null');
if ($state->{old}) {
exec("ldd", "-f", "NEEDED lib%o.so.%m.%n\n", $n) or
$state->fatal("exec ldd: #1", $!);
} else {
exec('objdump', '-p', $n) or
$state->fatal("exec objdump: #1", $!);
}
@ -151,8 +158,7 @@ sub record_needed_libs
$source->skip($item);
return;
}
my $n = $source->retrieve($state, $item);
my $cmd = run_objdump($state, $n);
my $cmd = run_objdump($state, $source, $item);
for my $lib (parse_objdump($cmd, $dest, $fullname)) {
# don't look for modules
next if $lib =~ m/\.so$/;

12
infrastructure/lib/OpenBSD/FileSource.pm

@ -1,4 +1,4 @@
# $OpenBSD: FileSource.pm,v 1.1 2010/08/20 15:29:41 espie Exp $
# $OpenBSD: FileSource.pm,v 1.2 2011/11/27 11:29:33 espie Exp $
# Copyright (c) 2004-2010 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
@ -21,6 +21,12 @@ use warnings;
package OpenBSD::FileSource;
sub directory
{
my $self = shift;
return $self->{location};
}
# file system
package OpenBSD::FsFileSource;
our @ISA = qw(OpenBSD::FileSource);
@ -33,7 +39,7 @@ sub new
sub retrieve
{
my ($self, $state, $item) = @_;
return $self->{location}.$item->fullname;
return $item->fullname;
}
sub skip
@ -78,7 +84,7 @@ sub retrieve
my ($self, $state, $item) = @_;
my $o = $self->prepare_to_extract($item);
$o->create;
return $self->extracted_name($item);
return $item->fullname;
}
sub skip