generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix make depend for things being built in subdirectories

Browse Source 
Some makedepend mechanisms remove all directory information in the
target, so a dependency can looks like this:

ssl3_record.o: record/ssl3_record.c

However, that doesn't quite suit us, our Makefile has us build
record/ssl3_record.o rather than ssl3_record.o.

To clear this up, a change to util/clean-depend.pl takes care of this
case by looking up the original file in the dependencies and restoring
the directory information from it.

Reviewed-by: Ben Laurie <ben@openssl.org>
This commit is contained in:
Richard Levitte 2015-10-04 21:12:03 +02:00
parent 5f0580ccf1
commit 46f4d2bef6
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
util/clean-depend.pl
View File

@ -11,22 +11,40 @@ while(<STDIN>) {
my %files; my %files;
# Fetch all the dependency output first
my $thisfile=""; my $thisfile="";
while(<STDIN>) { while(<STDIN>) {
my ($dummy, $file,$deps)=/^((.*):)? (.*)$/; my ($dummy, $file,$deps)=/^((.*):)? (.*)$/;
my $origfile="";
$thisfile=$file if defined $file; $thisfile=$file if defined $file;
next if !defined $deps; next if !defined $deps;
$origfile=$thisfile;
$origfile=~s/\.o$/.c/;
my @deps=split ' ',$deps; my @deps=split ' ',$deps;
@deps=grep(!/^\//,@deps);
@deps=grep(!/^\\$/,@deps); @deps=grep(!/^\\$/,@deps);
@deps=grep(!/^$origfile$/,@deps);
push @{$files{$thisfile}},@deps; push @{$files{$thisfile}},@deps;
} }
my $file; my $file;
# Time to clean out possible system directories and normalise quirks
# from different makedepend methods
foreach $file (sort keys %files) {
# This gets around a quirk with gcc, which removes all directory
# information from the original file
my $tmpfile=$file;
$tmpfile=~s/\.o$/.c/;
(my $origfile)=grep(/(^|\/)${tmpfile}$/,@{$files{$file}});
my $newfile=$origfile;
$newfile=~s/\.c$/.o/;
if ($newfile ne $file) {
$files{$newfile} = $files{$file};
delete $files{$file};
$file = $newfile;
}
@{$files{$file}} =
grep(!/^\//,
grep(!/^$origfile$/, @{$files{$file}}));
}
foreach $file (sort keys %files) { foreach $file (sort keys %files) {
my $len=0; my $len=0;
my $dep; my $dep;