diff options
| author | skrll <skrll> | 2001-05-18 16:23:20 +0000 |
|---|---|---|
| committer | skrll <skrll> | 2001-05-18 16:23:20 +0000 |
| commit | 88fc689354ffd2ef599c208b773fcc004ec45fae (patch) | |
| tree | 65a66b38abd0dad83c41648663cd2bce97756c7e | |
| parent | 34692ffd6cdb33b7b9171444cee87258967dc3b2 (diff) | |
| download | pkgsrc-88fc689354ffd2ef599c208b773fcc004ec45fae.tar.gz | |
Make sure that all ELF symlinks gets removed from the PLIST when doing
a.out automatic shlib handling. The offending symlink is created when
using the, somewhat strange, libtool -release option.
Reported by David Brownlee <abs@netbsd.org> on tech-pkg. Tested by myself
and David.
| -rw-r--r-- | mk/bsd.pkg.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 47865dc5c7b..26ca6d3bcd2 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.741 2001/05/18 10:29:10 abs Exp $ +# $NetBSD: bsd.pkg.mk,v 1.742 2001/05/18 16:23:20 skrll Exp $ # # This file is in the public domain. # @@ -1897,6 +1897,9 @@ do-shlib-handling: links[linkc++] = $$0; \ sub("\.[0-9]+$$", ""); \ links[linkc++] = $$0; \ + if (sub("-[^-]+\.so$$", "\.so")) { \ + links[linkc++] = $$0; \ + } \ next \ } \ /.*\/lib[^\/]+\.so\.[0-9]+\.[0-9]+$$/ { \ @@ -1906,6 +1909,9 @@ do-shlib-handling: links[linkc++] = $$0; \ sub("\.[0-9]+$$", ""); \ links[linkc++] = $$0; \ + if (sub("-[^-]+\.so$$", "\.so")) { \ + links[linkc++] = $$0; \ + } \ next \ } \ { lines[NR] = $$0 } \ |