&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;
grep /^-/, @ARGV) {
eval "use Debian::Debhelper::Dh_Getopt";
error($@) if $@;
- Debian::Debhelper::Dh_Getopt::parseopts($params{options});
+ Debian::Debhelper::Dh_Getopt::parseopts(%params);
}
# Another way to set excludes.
$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
verbose_print(escape_shell(@_));
if (! $dh{NO_ACT}) {
- system(@_) == 0 || _error_exitcode($_[0]);
+ system(@_) == 0 || _error_exitcode(join(" ", @_));
}
}
}
}
-# 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.
}
}
- if ($c < 4 && ! $warned_compat) {
+ if ($c <= 4 && ! $warned_compat) {
warning("Compatibility levels before 5 are deprecated.");
$warned_compat=1;
}
# 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, $_;
}
sub dpkg_architecture_value {
my $var = shift;
- my $value=`dpkg-architecture -q$var 2>/dev/null` || error("dpkg-architecture failed");
+ my $value=`dpkg-architecture -q$var` || error("dpkg-architecture failed");
chomp $value;
return $value;
}
my $os;
sub buildos {
- return $os if defined $os;
-
- $os=`dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null` || error("dpkg-architecture failed");
- chomp $os;
+ if (!defined $os) {
+ $os=dpkg_architecture_value("DEB_HOST_ARCH_OS");
+ }
return $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
}
# 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).
%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="";
$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="";
}
}
+# 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