X-Git-Url: https://git.jankratochvil.net/?p=massrebuild.git;a=blobdiff_plain;f=dtneededsize;h=0b15cc588bc2b40875375c3fec8c9ab9e7398741;hp=7a7120eb48d0fbb0cafe3a29d9a01655050d3600;hb=656a3e93403f216dd634d2ba81c8af8601650022;hpb=2229caba05ab067f60fbf7c3d7e147723216e51a

diff --git a/dtneededsize b/dtneededsize
index 7a7120e..0b15cc5 100755
--- a/dtneededsize
+++ b/dtneededsize
@@ -47,11 +47,36 @@ chdir "dtneeded.out" or die "dtneeded.out: $!";
 my %F;
 my %SONAME;
 my @DEBUG;
+my %SYMLINK;
 find {
   "no_chdir"=>1,
   "wanted"=>sub {
     die $File::Find::dir if $File::Find::dir=~m{/$};
     my $binfn=$File::Find::name;
+    if (-l $binfn) {
+      my $target=readlink $binfn or die $binfn;
+      $binfn=~s{^[.]}{};
+      my $final;
+      if ($target=~m{^/}) {
+	$final=$target;
+#warn "$binfn,target=rel=$$ref\n";
+      } else {
+	my $base=dirname(".$binfn");
+	my $abs=File::Spec->rel2abs($target,$base);
+	$final="/".File::Spec->abs2rel($abs);
+#warn "$binfn,base=$base,target=$target,abs=$abs,rel=$$ref\n";
+      }
+      1 while $final=~s{/[^/]+/[.][.]/}{/};
+      1 while $final=~s{/[^/]+/[.][.]$}{};
+      if ($final=~m{/[.][.]}) {
+	warn "$binfn,target=$target,final=$final\n";
+	return;
+      }
+      my $ref=\$SYMLINK{$binfn};
+      die if $$ref;
+      $$ref=$final;
+      return;
+    }
     return if !-f $binfn;
     die $binfn if $binfn!~m{^[.]/};
     my $bin=readfile $binfn;
@@ -69,6 +94,7 @@ find {
     };
     $h->{"rpath"}=$rpath if $rpath;
     $F{$binfn}=$h;
+#warn "$binfn=".Dumper($h)."\n" if $binfn=~/libc.so.6/;
 #    my $total=keys %F; warn "$total...\n" if 0==$total%1000;
     if ($soname) {
       my $sonamefn=$File::Find::dir."/".$soname;
@@ -81,11 +107,16 @@ find {
   },
 },".";
 
+#while (my($src,$target)=each %SYMLINK) {
+#  die "$src->$target" if exists $SYMLINK{$target};
+#}
+
 my $dwzsizeall=0;
 my $dtsizeall=0;
 my $computed=0;
 BINFN: for my $binfn (@DEBUG) {
 #  warn "$binfn...\n".Dumper([sort @{$F{$binfn}{"needed"}}]);
+  die $binfn if exists $SYMLINK{$binfn};
   my @l=$binfn;
   my %l=($binfn=>1);
   while (@l) {
@@ -94,6 +125,7 @@ BINFN: for my $binfn (@DEBUG) {
     for my $needed (@{$h->{"needed"}}) {
       my $found;
       if ($needed=~m{^/}) {
+	$needed=$SYMLINK{$needed} while exists $SYMLINK{$needed};
 	$found=$needed;
       } else {
 #	die "$binfn: $l: $needed" if $needed=~m{/};
@@ -107,6 +139,7 @@ BINFN: for my $binfn (@DEBUG) {
 	    next;
 	  }
 	  my $fn="$rpath/$needed";
+	  $fn=$SYMLINK{$fn} while exists $SYMLINK{$fn};
 	  next if !$SONAME{$fn};
 	  $found=$fn;
 	  last;
@@ -154,5 +187,5 @@ warn "$binfn: ".Dumper(\%dwzcommons);
   $dtsizeall+=$dtsizetot;
 #  warn "$binfn done\n".Dumper([sort keys(%l)]);
 }
-print "dwzsizeall=$dwzsizeall dtsizeall=$dtsizeall\n";
+print "dwzsizeall=$dwzsizeall dtsizeall=$dtsizeall =".$dwzsizeall/$dtsizeall."\n";
 print "computed=$computed of DEBUG=".(0+@DEBUG)."\n";