X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=Debian%2FDebhelper%2FDh_Lib.pm;h=155184be218bfe7266ba0ad60a935c97aec477d1;hb=5cee909d876bacad4f3d0e092d69fe0bfee6e083;hp=b3162d07ae9a77cc2844d73291e4b09436acbfe1;hpb=f897611a77726655aea258af0c4d52a8ce759ebc;p=debhelper.git diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm index b3162d0..155184b 100644 --- a/Debian/Debhelper/Dh_Lib.pm +++ b/Debian/Debhelper/Dh_Lib.pm @@ -16,7 +16,8 @@ use vars qw(@ISA @EXPORT %dh); &compat &addsubstvar &delsubstvar &excludefile &package_arch &is_udeb &udeb_filename &debhelper_script_subst &escape_shell &inhibit_log &load_log &write_log &dpkg_architecture_value - &sourcepackage); + &sourcepackage + &is_make_jobserver_unavailable &clean_jobserver_makeflags); my $max_compat=7; @@ -29,10 +30,10 @@ sub init { # Getopt::Long, which I'd prefer to avoid loading at all if possible. if ((defined $ENV{DH_OPTIONS} && length $ENV{DH_OPTIONS}) || (defined $ENV{DH_INTERNAL_OPTIONS} && length $ENV{DH_INTERNAL_OPTIONS}) || - (defined $params{extra_args}) || grep /^-/, @ARGV) { + grep /^-/, @ARGV) { eval "use Debian::Debhelper::Dh_Getopt"; error($@) if $@; - Debian::Debhelper::Dh_Getopt::parseopts($params{options}, $params{extra_args}); + Debian::Debhelper::Dh_Getopt::parseopts(%params); } # Another way to set excludes. @@ -64,18 +65,18 @@ sub init { $dh{NO_ACT}=1; } - my @allpackages=getpackages(); # Get the name of the main binary package (first one listed in # debian/control). Only if the main package was not set on the # command line. if (! exists $dh{MAINPACKAGE} || ! defined $dh{MAINPACKAGE}) { + my @allpackages=getpackages(); $dh{MAINPACKAGE}=$allpackages[0]; } # Check if packages to build have been specified, if not, fall back to - # the default, doing them all. + # the default, building all relevant packages. if (! defined $dh{DOPACKAGES} || ! @{$dh{DOPACKAGES}}) { - push @{$dh{DOPACKAGES}},@allpackages; + push @{$dh{DOPACKAGES}}, getpackages('both'); } # Check to see if -P was specified. If so, we can only act on a single @@ -175,7 +176,7 @@ sub doit { verbose_print(escape_shell(@_)); if (! $dh{NO_ACT}) { - system(@_) == 0 || _error_exitcode($_[0]); + system(@_) == 0 || _error_exitcode(join(" ", @_)); } } @@ -250,12 +251,11 @@ sub verbose_print { } } -# Output an error message and exit. +# Output an error message and die (can be caught). sub error { my $message=shift; - warning($message); - exit 1; + die basename($0).": $message\n"; } # Output a warning. @@ -312,7 +312,7 @@ sub dirname { } } - if ($c < 4 && ! $warned_compat) { + if ($c <= 4 && ! $warned_compat) { warning("Compatibility levels before 5 are deprecated."); $warned_compat=1; } @@ -576,7 +576,7 @@ sub filedoublearray { # as if we were in the specified directory, so the # filenames that come out are relative to it. if (defined $globdir && ! compat(2)) { - for (map { glob "$globdir/$_" } split) { + foreach (map { glob "$globdir/$_" } split) { s#^$globdir/##; push @line, $_; } @@ -606,48 +606,64 @@ sub excludefile { return 0; } -sub dpkg_architecture_value { - my $var = shift; - my $value=`dpkg-architecture -q$var 2>/dev/null` || 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 () { + 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; - - sub buildos { - return $os if defined $os; +# Returns the build architecture. +sub buildarch { + dpkg_architecture_value('DEB_HOST_ARCH'); +} - $os=`dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null` || error("dpkg-architecture failed"); - chomp $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 -sub samearch { - my $arch=shift; - my @archlist=split(/\s+/,shift); +{ + my %knownsame; - foreach my $a (@archlist) { - system("dpkg-architecture", "-a$arch", "-i$a") == 0 && return 1; + sub samearch { + my $arch=shift; + my @archlist=split(/\s+/,shift); + + foreach my $a (@archlist) { + # Avoid expensive dpkg-architecture call to compare + # with a simple architecture name. "linux-any" and + # other architecture wildcards are (currently) + # always hypenated. + if ($a !~ /-/) { + return 1 if $arch eq $a; + } + elsif (exists $knownsame{$arch}{$a}) { + return 1 if $knownsame{$arch}{$a}; + } + elsif (system("dpkg-architecture", "-a$arch", "-i$a") == 0) { + return $knownsame{$arch}{$a}=1; + } + else { + $knownsame{$arch}{$a}=0; + } + } + + return 0; } - - return 0; } # Returns source package name @@ -668,8 +684,9 @@ sub sourcepackage { } # Returns a list of packages in the control file. -# Must pass "arch" or "indep" or "same" to specify arch-dependant or -# -independant or same arch packages. If nothing is specified, returns all +# Pass "arch" or "indep" to specify arch-dependant (that will be built +# for the system's arch) or independant. If nothing is specified, +# returns all packages. Also, "both" returns the union of "arch" and "indep" # packages. # As a side effect, populates %package_arches and %package_types with the # types of all packages (not only those returned). @@ -681,12 +698,6 @@ sub getpackages { %package_arches=(); $type="" if ! defined $type; - - # Look up the build arch if we need to. - my $buildarch=''; - if ($type eq 'same') { - $buildarch=buildarch(); - } my $package=""; my $arch=""; @@ -721,10 +732,12 @@ sub getpackages { $package_types{$package}=$package_type; $package_arches{$package}=$arch; } + if ($package && - (($type eq 'indep' && $arch eq 'all') || - ($type eq 'arch' && $arch ne 'all') || - ($type eq 'same' && ($arch eq 'any' || samearch($buildarch, $arch))) || + ((($type eq 'indep' || $type eq 'both') && $arch eq 'all') || + (($type eq 'arch' || $type eq 'both') && ($arch eq 'any' || + ($arch ne 'all' && + samearch(buildarch(), $arch)))) || ! $type)) { push @list, $package; $package=""; @@ -800,4 +813,32 @@ sub debhelper_script_subst { } } +# Checks if make's jobserver is enabled via MAKEFLAGS, but +# the FD used to communicate with it is actually not available. +sub is_make_jobserver_unavailable { + if (exists $ENV{MAKEFLAGS} && + $ENV{MAKEFLAGS} =~ /(?:^|\s)--jobserver-fds=(\d+)/) { + if (!open(my $in, "<&$1")) { + return 1; # unavailable + } + else { + close $in; + return 0; # available + } + } + + return; # no jobserver specified +} + +# Cleans out jobserver options from MAKEFLAGS. +sub clean_jobserver_makeflags { + if (exists $ENV{MAKEFLAGS}) { + if ($ENV{MAKEFLAGS} =~ /(?:^|\s)--jobserver-fds=(\d+)/) { + $ENV{MAKEFLAGS} =~ s/(?:^|\s)--jobserver-fds=\S+//g; + $ENV{MAKEFLAGS} =~ s/(?:^|\s)-j\b//g; + } + delete $ENV{MAKEFLAGS} if $ENV{MAKEFLAGS} =~ /^\s*$/; + } +} + 1