cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- revert libtool to -r1.16, as -r1.17 breaks at least dynamips, lftp and

Browse Source 
silc-server.

found by landry@ and myself the hardway

ok sthen@ espie@
This commit is contained in:
jasper 2010-10-28 22:19:03 +00:00
parent 09195a2f3f
commit df430ae277
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
infrastructure/bin/libtool
View File

@ -1,5 +1,5 @@
#!/usr/bin/perl
# $OpenBSD: libtool,v 1.19 2010/10/28 09:08:27 steven Exp $
# $OpenBSD: libtool,v 1.20 2010/10/28 22:19:03 jasper Exp $
# Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org>
#
@ -1349,7 +1349,6 @@ if ($mode eq 'compile') {
}
my $toinstall = {};
my $tosymlink = {}; # for libraries with a -release in their name
my $tostrip = [];
my $addedmode = 0;
foreach my $s (@src) {
my $dstfile = basename $s;
@ -1376,7 +1375,6 @@ if ($mode eq 'compile') {
my $laipath = "$srcdir/$ltdir/$srcfile".'i';
$toinstall->{"$srcdir/$ltdir/$staticlib"} = "$dstdir/$staticlib"
if ($staticlib);
push @$tostrip, "$dstdir/$staticlib" if ($install_opts{'s'} && $staticlib);
$toinstall->{"$srcdir/$ltdir/$sharedlib"} = "$dstdir/$sharedlib"
if ($sharedlib);
$toinstall->{"$laipath"} = "$dstdir/$dstfile";
@ -1392,16 +1390,11 @@ if ($mode eq 'compile') {
while (my ($s, $d) = each %$toinstall) {
my @realinstopts = @instopts;
# do not try to strip .la files
# do not strip static libraries, this is done below
if ($s =~ m/\.la$/ || $d =~ m /\.la$/ || $d =~ m/\.a$/) {
if ($s =~ m/\.la$/ || $d =~ m /\.la$/) {
@realinstopts = grep { $_ ne '-s' } @realinstopts;
}
Exec->command(@$ltprog, @realinstopts, $s, $d);
}
foreach my $f (@$tostrip) {
my @stripopts = ('--strip-debug');
Exec->command('strip', @stripopts, $f);
}
while (my ($d, $s) = each %$tosymlink) {
unlink("$dstdir/$d");
symlink($s, "$dstdir/$d");
@ -1477,14 +1470,15 @@ if ($mode eq 'compile') {
my @objs;
my @sobjs;
my $allpicobj;
if ($opts{'objectlist'}) {
my $objectlist = $opts{'objectlist'};
open(my $ol, '<', $objectlist) or die "cannot open $objectlist: $!\n";
my @objlist = <$ol>;
for (@objlist) { chomp; }
generate_objlist(\@objs, \@sobjs, \@objlist);
$allpicobj = generate_objlist(\@objs, \@sobjs, \@objlist);
} else {
generate_objlist(\@objs, \@sobjs, \@ARGV);
$allpicobj = generate_objlist(\@objs, \@sobjs, \@ARGV);
}
Trace::debug {"objs = @objs\n"};
Trace::debug {"sobjs = @sobjs\n"};
@ -1606,7 +1600,7 @@ if ($mode eq 'compile') {
}
if ($static) {
$lainfo->{'old_library'} = $staticlib;
$lainfo->link($ltprog, $ofile, $staticlib, $odir, 0, ($convenience) ? \@sobjs : \@objs, $dirs, $libs, $deplibs, $libdirs, $parser, \%opts);
$lainfo->link($ltprog, $ofile, $staticlib, $odir, 0, ($allpicobj) ? \@sobjs : \@objs, $dirs, $libs, $deplibs, $libdirs, $parser, \%opts);
Trace::debug {($convenience ? "convenience" : "static")." lib: $staticlib\n"};
}
$lainfo->{'installed'} = 'no';
@ -1774,6 +1768,7 @@ sub generate_objlist
my $objs = shift;
my $sobjs = shift;
my $objsource = shift;
my $allpic = 1;
my $result = [];
foreach my $a (@$objsource) {
@ -1792,6 +1787,8 @@ sub generate_objlist
$o .= "$odir/" if ($odir ne '.');
$o .= $loinfo->{'pic_object'};
push @$sobjs, $o;
} else {
$allpic = 0;
}
} elsif ($a =~ m/\S+\.o$/) {
push @$objs, $a;
@ -1800,6 +1797,7 @@ sub generate_objlist
}
}
@$objsource = @$result;
return $allpic;
}
# XXX reuse code from SharedLibs.pm instead