#! /usr/bin/env perl
-# Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the Apache License 2.0 (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
my $debug = $ENV{ADD_DEPENDS_DEBUG};
my $buildfile = $config{build_file};
my $build_mtime = (stat($buildfile))[9];
+my $configdata_mtime = (stat('configdata.pm'))[9];
my $rebuild = 0;
my $depext = $target{dep_extension} || ".d";
my @depfiles =
grep {
# This grep has side effects. Not only does if check the existence
# of the dependency file given in $_, but it also checks if it's
- # newer than the build file, and if it is, sets $rebuild.
+ # newer than the build file or older than configdata.pm, and if it
+ # is, sets $rebuild.
my @st = stat($_);
- $rebuild = 1 if @st && $st[9] > $build_mtime;
+ $rebuild = 1
+ if @st && ($st[9] > $build_mtime || $st[9] < $configdata_mtime);
scalar @st > 0; # Determines the grep result
}
map { (my $x = $_) =~ s|\.o$|$depext|; $x; }
keys %{$unified_info{generate}};
my %procedures = (
- 'gcc' => undef, # gcc style dependency files needs no mods
+ 'gcc' =>
+ sub {
+ (my $objfile = shift) =~ s|\.d$|.o|i;
+ my $line = shift;
+
+ # Remove the original object file
+ $line =~ s|^.*\.o: | |;
+ # All we got now is a dependency, shave off surrounding spaces
+ $line =~ s/^\s+//;
+ $line =~ s/\s+$//;
+ # Also, shave off any continuation
+ $line =~ s/\s*\\$//;
+
+ # Split the line into individual header files, and keep those
+ # that exist in some form
+ my @headers;
+ for (split(/\s+/, $line)) {
+ my $x = rel2abs($_);
+
+ if (!$depconv_cache{$x}) {
+ if (-f $x) {
+ $depconv_cache{$x} = $_;
+ }
+ }
+
+ if ($depconv_cache{$x}) {
+ push @headers, $_;
+ } else {
+ print STDERR "DEBUG[$producer]: ignoring $objfile <- $line\n"
+ if $debug;
+ }
+ }
+ return ($objfile, join(' ', @headers)) if @headers;
+ return undef;
+ },
'makedepend' =>
sub {
# makedepend, in its infinite wisdom, wants to have the object file
# mappings for generated headers, we only need to deal
# with the source tree.
if ($dep =~ s|^\Q$abs_srcdir_shaved\E([\.>\]])?|$srcdir_shaved$1|i) {
- $depconv_cache{$line} = $dep;
+ # Also check that the header actually exists
+ if (-f $line) {
+ $depconv_cache{$line} = $dep;
+ }
}
}
return ($objfile, $depconv_cache{$line})
#
# Hinweis: Einlesen der Datei: {whatever header file}
#
- # To accomodate, we need to use a very general regular expression
+ # To accommodate, we need to use a very general regular expression
# to parse those lines.
#
# Since there's no object file name at all in that information,
# mappings for generated headers, we only need to deal
# with the source tree.
if ($dep =~ s|^\Q$abs_srcdir\E\\|\$(SRCDIR)\\|i) {
- $depconv_cache{$tail} = $dep;
+ # Also check that the header actually exists
+ if (-f $line) {
+ $depconv_cache{$tail} = $dep;
+ }
}
}
return ($objfile, '"'.$depconv_cache{$tail}.'"')
# mappings for generated headers, we only need to deal
# with the source tree.
if ($dep =~ s|^\Q$abs_srcdir\E\\|\$(SRCDIR)\\|i) {
- $depconv_cache{$tail} = $dep;
+ # Also check that the header actually exists
+ if (-f $line) {
+ $depconv_cache{$tail} = $dep;
+ }
}
}
return ($objfile, '"'.$depconv_cache{$tail}.'"')
},
);
my %continuations = (
- 'gcc' => undef,
+ 'gcc' => "\\",
'makedepend' => "\\",
'VMS C' => "-",
'VC' => "\\",
my $buildfile_new = "$buildfile-$$";
my %collect = ();
-if (defined $procedure) {
- foreach my $depfile (@depfiles) {
- open IDEP,$depfile or die "Trying to read $depfile: $!\n";
- while (<IDEP>) {
- s|\R$||; # The better chomp
- my ($target, $deps) = $procedure->($depfile, $_);
- $collect{$target}->{$deps} = 1 if defined $target;
- }
- close IDEP;
+foreach my $depfile (@depfiles) {
+ open IDEP,$depfile or die "Trying to read $depfile: $!\n";
+ while (<IDEP>) {
+ s|\R$||; # The better chomp
+ my ($target, $deps) = $procedure->($depfile, $_);
+ $collect{$target}->{$deps} = 1 if defined $target;
}
+ close IDEP;
}
open IBF, $buildfile or die "Trying to read $buildfile: $!\n";
print OBF "# DO NOT DELETE THIS LINE -- make depend depends on it.\n";
-if (defined $procedure) {
- foreach my $target (sort keys %collect) {
- my $prefix = $target . ' :';
- my @deps = sort keys %{$collect{$target}};
+foreach my $target (sort keys %collect) {
+ my $prefix = $target . ' :';
+ my @deps = sort keys %{$collect{$target}};
- while (@deps) {
- my $buf = $prefix;
- $prefix = '';
+ while (@deps) {
+ my $buf = $prefix;
+ $prefix = '';
- while (@deps && ($buf eq ''
- || length($buf) + length($deps[0]) <= 77)) {
- $buf .= ' ' . shift @deps;
- }
- $buf .= ' '.$continuation if @deps;
-
- print OBF $buf,"\n" or die "Trying to print: $!\n"
+ while (@deps && ($buf eq ''
+ || length($buf) + length($deps[0]) <= 77)) {
+ $buf .= ' ' . shift @deps;
}
- }
-} else {
- foreach my $depfile (@depfiles) {
- open IDEP,$depfile or die "Trying to read $depfile: $!\n";
- while (<IDEP>) {
- print OBF or die "Trying to print: $!\n";
- }
- close IDEP;
+ $buf .= ' '.$continuation if @deps;
+
+ print OBF $buf,"\n" or die "Trying to print: $!\n"
}
}
projects / openssl.git / blobdiff