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

when a lib has multiple different library names, populate the .libs dir with

Browse Source 
symlinks to all of them.

this fixes kde/multimedia, which builds a libmpeg-0.3.0.so (using -release),
also known as libmpeg.so, and then links something with -lmpeg ...
(before this commit, we only had a symlink to the former)
it should really just use libmpeg.la instead, but let's have libtool handle
such attempts anyway.
might fix other stuff i'm not yet aware of, too.
This commit is contained in:
steven 2010-09-19 17:30:52 +00:00
parent 682f1bd30b
commit 8618d9ee5f
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
infrastructure/bin/libtool
View File

@ -1,5 +1,5 @@
#!/usr/bin/perl
# $OpenBSD: libtool,v 1.3 2010/09/18 16:22:26 steven Exp $
# $OpenBSD: libtool,v 1.4 2010/09/19 17:30:52 steven Exp $
# Copyright (c) 2007-2010 Steven Mestdagh <steven@openbsd.org>
#
@ -1690,10 +1690,20 @@ sub create_symlinks
my $f = $l->{fullpath};
next if (!defined $f);
next if ($f =~ m/\.a$/);
my $libfile = basename $f;
Trace::debug {"ln -s $f $dir/$libfile\n"};
if (! -f "$dir/$libfile") {
symlink abs_path($f), "$dir/$libfile" or die "cannot create symlink: $!\n";
my $libnames = [];
if (defined $l->{lafile}) {
my $lainfo = LaFile->parse($l->{lafile});
my $librarynames = $lainfo->stringize('library_names');
@$libnames = split /\s/, $librarynames;
$libnames = reverse_zap_duplicates_ref($libnames);
} else {
push @$libnames, basename $f;
}
foreach my $libfile (@$libnames) {
Trace::debug {"ln -s $f $dir/$libfile\n"};
if (! -f "$dir/$libfile") {
symlink abs_path($f), "$dir/$libfile" or die "cannot create symlink: $!\n";
}
}
}
}