X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debian%2FDebhelper%2FDh_Lib.pm;h=7b550b0ea5752820d98d1a84d49b5255c3aeeedc;hb=a3494762925e5a42a42ce82c688f62f163ffad1b;hp=51f16a6f8226fc29b9258d3ec3b084b85fd1be5e;hpb=0f2969a41c07f0435ddac202a858ab914fd7eff7;p=debhelper.git diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm index 51f16a6..7b550b0 100644 --- a/Debian/Debhelper/Dh_Lib.pm +++ b/Debian/Debhelper/Dh_Lib.pm @@ -18,9 +18,9 @@ use vars qw(@ISA @EXPORT %dh); &inhibit_log &load_log &write_log &commit_override_log &dpkg_architecture_value &sourcepackage &is_make_jobserver_unavailable &clean_jobserver_makeflags - &cross_command &set_buildflags); + &cross_command &set_buildflags &get_buildoption); -my $max_compat=9; +my $max_compat=10; sub init { my %params=@_; @@ -146,6 +146,8 @@ sub write_log { my $cmd=shift; my @packages=@_; + return if $dh{NO_ACT}; + foreach my $package (@packages) { my $log=logfile($package); open(LOG, ">>", $log) || error("failed to write to ${log}: $!"); @@ -157,6 +159,8 @@ sub write_log { sub commit_override_log { my @packages=@_; + return if $dh{NO_ACT}; + foreach my $package (@packages) { my @log=map { remove_override($_) } load_log($package); my $log=logfile($package); @@ -324,29 +328,35 @@ sub dirname { sub compat { my $num=shift; + my $nowarn=shift; if (! defined $c) { $c=1; - if (defined $ENV{DH_COMPAT}) { - $c=$ENV{DH_COMPAT}; - } - elsif (-e 'debian/compat') { - # Try the file.. + if (-e 'debian/compat') { open (COMPAT_IN, "debian/compat") || error "debian/compat: $!"; my $l=; close COMPAT_IN; if (! defined $l || ! length $l) { - warning("debian/compat is empty, assuming level $c"); + warning("debian/compat is empty, assuming level $c") + unless defined $ENV{DH_COMPAT}; } else { chomp $l; $c=$l; } } + else { + warning("No compatibility level specified in debian/compat"); + warning("This package will soon FTBFS; time to fix it!"); + } + + if (defined $ENV{DH_COMPAT}) { + $c=$ENV{DH_COMPAT}; + } } - if ($c <= 4 && ! $warned_compat) { - warning("Compatibility levels before 5 are deprecated."); + if ($c <= 4 && ! $warned_compat && ! $nowarn) { + warning("Compatibility levels before 5 are deprecated (level $c in use)"); $warned_compat=1; } @@ -494,7 +504,8 @@ sub pkgfilename { # 1: package # 2: script to add to # 3: filename of snippet -# 4: sed to run on the snippet. Ie, s/#PACKAGE#/$PACKAGE/ +# 4: either text: shell-quoted sed to run on the snippet. Ie, 's/#PACKAGE#/$PACKAGE/' +# or a sub to run on each line of the snippet. Ie sub { s/#PACKAGE#/$PACKAGE/ } sub autoscript { my $package=shift; my $script=shift; @@ -523,18 +534,34 @@ sub autoscript { && !compat(5)) { # Add fragments to top so they run in reverse order when removing. complex_doit("echo \"# Automatically added by ".basename($0)."\"> $outfile.new"); - complex_doit("sed \"$sed\" $infile >> $outfile.new"); + autoscript_sed($sed, $infile, "$outfile.new"); complex_doit("echo '# End automatically added section' >> $outfile.new"); complex_doit("cat $outfile >> $outfile.new"); complex_doit("mv $outfile.new $outfile"); } else { complex_doit("echo \"# Automatically added by ".basename($0)."\">> $outfile"); - complex_doit("sed \"$sed\" $infile >> $outfile"); + autoscript_sed($sed, $infile, $outfile); complex_doit("echo '# End automatically added section' >> $outfile"); } } +sub autoscript_sed { + my $sed = shift; + my $infile = shift; + my $outfile = shift; + if (ref($sed) eq 'CODE') { + open(IN, $infile) or die "$infile: $!"; + open(OUT, ">>$outfile") or die "$outfile: $!"; + while () { $sed->(); print OUT } + close(OUT) or die "$outfile: $!"; + close(IN) or die "$infile: $!"; + } + else { + complex_doit("sed \"$sed\" $infile >> $outfile"); + } +} + # Removes a whole substvar line. sub delsubstvar { my $package=shift; @@ -608,12 +635,22 @@ sub filedoublearray { my $file=shift; my $globdir=shift; + # executable config files are a v9 thing. + my $x=! compat(8) && -x $file; + if ($x) { + require Cwd; + my $cmd=Cwd::abs_path($file); + open (DH_FARRAY_IN, "$cmd |") || error("cannot run $file: $!"); + } + else { + open (DH_FARRAY_IN, $file) || error("cannot read $file: $!"); + } + my @ret; - open (DH_FARRAY_IN, $file) || error("cannot read $file: $!"); while () { chomp; # Only ignore comments and empty lines in v5 mode. - if (! compat(4)) { + if (! compat(4) && ! $x) { next if /^#/ || /^$/; } my @line; @@ -622,7 +659,7 @@ sub filedoublearray { # The tricky bit is that the glob expansion is done # as if we were in the specified directory, so the # filenames that come out are relative to it. - if (defined $globdir && ! compat(2)) { + if (defined $globdir && ! compat(2) && ! $x) { foreach (map { glob "$globdir/$_" } split) { s#^$globdir/##; push @line, $_; @@ -633,7 +670,8 @@ sub filedoublearray { } push @ret, [@line]; } - close DH_FARRAY_IN; + + close DH_FARRAY_IN || error("problem reading $file: $!"); return @ret; } @@ -901,32 +939,40 @@ sub cross_command { } # Sets environment variables from dpkg-buildflags. Avoids changing -# any existing environment variables. Supports DEB_BUILD_OPTIONS=noopt. +# any existing environment variables. sub set_buildflags { - # optimisation - return if $ENV{DH_INTERNAL_BUILDFLAGS}; + return if $ENV{DH_INTERNAL_BUILDFLAGS} || compat(8); $ENV{DH_INTERNAL_BUILDFLAGS}=1; - my $noopt=$ENV{DEB_BUILD_OPTIONS}=~/noopt/; - - my @shell=`dpkg-buildflags --export`; - foreach my $line (@shell) { - chomp $line; - if ($line=~/^export\s+([^=]+)=(["'])(.*)\2$/) { - my $var=$1; - my $val=$3; - if ($noopt) { - $val=$ENV{$var} if exists $ENV{$var}; - $val=~s/-O\d+/-O0/; - $ENV{$var}=$val; - next; - } - elsif (! exists $ENV{$var}) { - $ENV{$var}=$val; - } + eval "use Dpkg::BuildFlags"; + if ($@) { + warning "unable to load build flags: $@"; + return; + } + + my $buildflags = Dpkg::BuildFlags->new(); + $buildflags->load_config(); + foreach my $flag ($buildflags->list()) { + next unless $flag =~ /^[A-Z]/; # Skip flags starting with lowercase + if (! exists $ENV{$flag}) { + $ENV{$flag} = $buildflags->get($flag); } - else { - warning "unparsable line from dpkg-buildflags: $line"; + } +} + +# Gets a DEB_BUILD_OPTIONS option, if set. +sub get_buildoption { + my $wanted=shift; + + return undef unless exists $ENV{DEB_BUILD_OPTIONS}; + + foreach my $opt (split(/\s+/, $ENV{DEB_BUILD_OPTIONS})) { + # currently parallel= is the only one with a parameter + if ($opt =~ /^parallel=(-?\d+)$/ && $wanted eq 'parallel') { + return $1; + } + elsif ($opt eq $wanted) { + return 1; } } }