merge

[debhelper.git] / Debian / Debhelper / Dh_Lib.pm

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 421dd99647fa69f5f530493da00857d00925df02..fb83480b5324b69182c26fcc2e17587e1678332b 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -19,7 +19,7 @@ use vars qw(@ISA @EXPORT %dh);
            &sourcepackage
            &is_make_jobserver_unavailable &clean_jobserver_makeflags);
 
-my $max_compat=7;
+my $max_compat=8;
 
 sub init {
        my %params=@_;
@@ -125,6 +125,8 @@ sub write_log {
        my $cmd=shift;
        my @packages=@_;
 
+       return if defined $ENV{DH_INHIBIT_LOG} && $cmd eq $ENV{DH_INHIBIT_LOG};
+
        foreach my $package (@packages) {
                my $ext=pkgext($package);
                my $log="debian/${ext}debhelper.log";
@@ -215,6 +217,7 @@ sub xargs {
 
         # The kernel can accept command lines up to 20k worth of characters.
        my $command_max=20000; # LINUX SPECIFIC!!
+                       # (And obsolete; it's bigger now.)
                        # I could use POSIX::ARG_MAX, but that would be slow.
 
        # Figure out length of static portion of command.
@@ -364,9 +367,23 @@ sub pkgfile {
                $filename="$dh{NAME}.$filename";
        }
        
-       my @try=("debian/$package.$filename.".buildarch(),
-                "debian/$package.$filename.".buildos(),
-                "debian/$package.$filename");
+       # First, check for files ending in buildarch and buildos.
+       my $match;
+       foreach my $file (glob("debian/$package.$filename.*")) {
+               next if ! -f $file;
+               next if $dh{IGNORE} && exists $dh{IGNORE}->{$file};
+               if ($file eq "debian/$package.$filename.".buildarch()) {
+                       $match=$file;
+                       # buildarch files are used in preference to buildos files.
+                       last;
+               }
+               elsif ($file eq "debian/$package.$filename.".buildos()) {
+                       $match=$file;
+               }
+       }
+       return $match if defined $match;
+
+       my @try=("debian/$package.$filename");
        if ($package eq $dh{MAINPACKAGE}) {
                push @try, "debian/$filename";
        }
@@ -606,35 +623,33 @@ sub excludefile {
         return 0;
 }
 
-sub dpkg_architecture_value {
-       my $var = shift;
-       my $value=`dpkg-architecture -q$var` || error("dpkg-architecture failed");
-       chomp $value;
-       return $value;
-}
-
-# Returns the build architecture. (Memoized)
 {
-       my $arch;
-       
-       sub buildarch {
-               if (!defined $arch) {
-                   $arch=dpkg_architecture_value('DEB_HOST_ARCH');
+       my %dpkg_arch_output;
+       sub dpkg_architecture_value {
+               my $var = shift;
+               if (! exists($dpkg_arch_output{$var})) {
+                       local $_;
+                       open(PIPE, '-|', 'dpkg-architecture')
+                               or error("dpkg-architecture failed");
+                       while (<PIPE>) {
+                               chomp;
+                               my ($k, $v) = split(/=/, $_, 2);
+                               $dpkg_arch_output{$k} = $v;
+                       }
+                       close(PIPE);
                }
-               return $arch;
+               return $dpkg_arch_output{$var};
        }
 }
 
-# Returns the build OS. (Memoized)
-{
-       my $os;
+# Returns the build architecture.
+sub buildarch {
+       dpkg_architecture_value('DEB_HOST_ARCH');
+}
 
-       sub buildos {
-               if (!defined $os) {
-                       $os=dpkg_architecture_value("DEB_HOST_ARCH_OS");
-               }
-               return $os;
-       }
+# Returns the build OS.
+sub buildos {
+       dpkg_architecture_value("DEB_HOST_ARCH_OS");
 }
 
 # Passed an arch and a list of arches to match against, returns true if matched