[BACK]Return to find_depends CVS log [TXT][DIR] Up to [local] / openbsd / fill_chroot

Diff for /openbsd/fill_chroot/find_depends between version 1.5 and 1.12

version 1.5, 2005/12/21 19:14:12 version 1.12, 2008/09/16 23:38:04
Line 1 
Line 1 
 #!/usr/bin/perl  #!/usr/bin/perl
 # $RedRiver: find_depends,v 1.4 2005/12/21 18:37:38 andrew Exp $  # $RedRiver: find_depends,v 1.11 2008/09/16 22:28:53 andrew Exp $
 use strict;  use strict;
 use warnings;  use warnings;
   
Line 66 
Line 66 
   
   my @libs = search_file($file);    my @libs = search_file($file);
   foreach (@libs) {    foreach (@libs) {
     my ($name, $maj, $min) = $_ =~ /^([^\.]+)\.so\.(\d+)\.(\d+)$/;      my $spec;
     my $spec = 'l' . $name . '.' . $maj . '.' . $min;  
       if ($_ eq $file) {
           # We don't want to include the file we are looking in
           next;
       }
       elsif ( my ($name, $maj, $min) = $_ =~ /lib([^\/]+)\.so\.(\d+)\.(\d+)$/ ) {
           $spec = 'l' . $name . '.' . $maj . '.' . $min;
           if ($ld->{$spec}) {
               $locs->{$spec} = $ld->{$spec};
           }
       }
       elsif (-e $_) {
           $spec = $_;
           $locs->{$spec} = $spec;
       }
       else {
           next;
       }
   
     if (exists $ld->{$spec}) {      if (! $locs->{$spec}) {
       next if exists $locs->{$spec};        print STDERR "Couldn't find location for '$_' (file '$file')\n";
         next;
       }
   
       $locs->{$spec} = $ld->{$spec};      print "  Found '$spec' => '$locs->{$spec}'\n" if $opts{v};
   
       $locs = find_libs($locs->{$spec}, $ld, $locs);      $locs = find_libs($locs->{$spec}, $ld, $locs);
   
     } else {  
       warn "Couldn't find location for lib '$_'";  
     }  
   }    }
   
   return $locs;    return $locs;
Line 88 
Line 104 
 {  {
   my $file = shift;    my $file = shift;
   my @libs;    my @libs;
   
   open my $libs, '<', $file or die "Couldn't open lib '$file': $!";    open my $libs, '-|', '/usr/bin/ldd', $file or die "Couldn't open ldd '$file': $!";
   local $/ = chr(0);  
   while (<$libs>) {    while (<$libs>) {
     if (m|^(/[^\w\/]+/)?lib(\S+)\.(\d+)\.(\d+)|) {      chomp;
       my ($path, $name, $major, $minor) = ($1, $2, $3, $4);      my ($spec) = (split(/\s+/, $_))[7];
       my $spec="$name.$major.$minor";      next if ! $spec;
       if (defined $path && $path ne '/usr/local/lib') {      next if $spec !~ m{^/}xms;
         $spec="$path/$spec";      push @libs, $spec;
       }  
       push @libs, $spec;  
     }  
   }    }
   close $libs;    close $libs;
   
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.12
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>