Changeset 176

Timestamp:

12/04/12 17:04:26 (12 years ago)

Author:

kdeugau

Message:

/trunk

Extend/fix autoreq handling for some new quirks (so it doesn't pick
up -dev dependencies that really aren't required at runtime), possibly
make it a bit more efficient

File:

• trunk/debbuild (modified) (3 diffs)

trunk/debbuild

@@ -1567 +1567 @@
   my %reqs;
   my $reqlibs = '';
+  my %reqliblist;
 
   foreach (@reqlist) {
@@ -1575 +1576 @@
     next if /linux-vdso.so/;            # More kernel hackery.  Whee!
 
+    # Whee!  more hackery to detect provided-here libs.  Some apparently return from ldd as "not found".
+    my ($a,$b) = split / => /;
+    $a =~ s/\s*//g;
+    if ($b =~ /not found/) {
+      next if qx { find $specglobals{buildroot} -name "*$a" };
+    }
+
     my ($req) = (m|=\>\s+([a-zA-Z0-9._/+-]+)|); # dig out the actual library (so)name.
         # And feh, we need the *path*, since I've discovered a new edge case where
@@ -1586 +1594 @@
 
     $reqlibs .= " $req";
+    $reqliblist{$req} = 1;
   }
 
-  if ($reqlibs ne '') {
-    foreach (qx { dpkg -S $reqlibs }) {
-      my ($libpkg,undef) = split /:/;
+  if (%reqliblist) {
+    foreach my $rlib (keys %reqliblist) {
+      my $libpkg = qx { dpkg -S $rlib };
+      ($libpkg,undef) = split /:/, $libpkg;
       $reqs{$libpkg} = 1;
     }