diff options
| author | tv <tv@pkgsrc.org> | 2004-06-04 19:21:23 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2004-06-04 19:21:23 +0000 |
| commit | b04b3d3ba02885f9601498b9f417cf1ab7fe9247 (patch) | |
| tree | d34e6ec35f370142f369a57a08c44bd63175377b /mk | |
| parent | 27d2003a39cd6265377d217b450e5350d7c3cebd (diff) | |
| download | pkgsrc-b04b3d3ba02885f9601498b9f417cf1ab7fe9247.tar.gz | |
A couple packages (including the new boost) use "libfoo.so" as a directory
name -- this seems to be common among Jam-using packages. So, make sure
to do the -L -l transform only if at the end of a word. This unfortunately
doubles the number of regexes needed to match (one with $_sep, one with $).
While here, though, the expressions for .so, .so.X, .so.X.Y, and .so.X.Y.Z
can all be collapsed into only one set with the use of \(\.[0-9]\)*, so we
actually end up with *less* regexes than before. :)
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink3/gen-transform.sh | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/mk/buildlink3/gen-transform.sh b/mk/buildlink3/gen-transform.sh index bafd60598ba..b3ad35ee80d 100644 --- a/mk/buildlink3/gen-transform.sh +++ b/mk/buildlink3/gen-transform.sh @@ -1,6 +1,6 @@ #!@BUILDLINK_SHELL@ # -# $NetBSD: gen-transform.sh,v 1.26 2004/03/13 03:41:13 uebayasi Exp $ +# $NetBSD: gen-transform.sh,v 1.27 2004/06/04 19:21:23 tv Exp $ transform="@_BLNK_TRANSFORM_SEDFILE@" untransform="@_BLNK_UNTRANSFORM_SEDFILE@" @@ -226,16 +226,14 @@ EOF case "$action" in transform|untransform) @CAT@ >> $sedfile << EOF -s|\($2/[^$_sep]*\)/lib\([^/$_sep]*\)\.so\.[0-9]*\.[0-9]*\.[0-9]*|-L\1 -l\2|g -s|\($2\)/lib\([^/$_sep]*\)\.so\.[0-9]*\.[0-9]*\.[0-9]*|-L\1 -l\2|g -s|\($2/[^$_sep]*\)/lib\([^/$_sep]*\)\.so\.[0-9]*\.[0-9]*|-L\1 -l\2|g -s|\($2\)/lib\([^/$_sep]*\)\.so\.[0-9]*\.[0-9]*|-L\1 -l\2|g -s|\($2/[^$_sep]*\)/lib\([^/$_sep]*\)\.so\.[0-9]*|-L\1 -l\2|g -s|\($2\)/lib\([^/$_sep]*\)\.so\.[0-9]*|-L\1 -l\2|g -s|\($2/[^$_sep]*\)/lib\([^/$_sep]*\)\.so|-L\1 -l\2|g -s|\($2\)/lib\([^/$_sep]*\)\.so|-L\1 -l\2|g -s|\($2/[^$_sep]*\)/lib\([^/$_sep]*\)\.dylib|-L\1 -l\2|g -s|\($2\)/lib\([^/$_sep]*\)\.dylib|-L\1 -l\2|g +s|\($2/[^$_sep]*\)/lib\([^/$_sep]*\)\.so\(\.[0-9]*\)*\([$_sep]\)|-L\1 -l\2\4|g +s|\($2/[^$_sep]*\)/lib\([^/$_sep]*\)\.so\(\.[0-9]*\)*$|-L\1 -l\2|g +s|\($2\)/lib\([^/$_sep]*\)\.so\(\.[0-9]*\)*\([$_sep]\)|-L\1 -l\2\4|g +s|\($2\)/lib\([^/$_sep]*\)\.so\(\.[0-9]*\)*$|-L\1 -l\2|g +s|\($2/[^$_sep]*\)/lib\([^/$_sep]*\)\.dylib\([$_sep]\)|-L\1 -l\2\3|g +s|\($2/[^$_sep]*\)/lib\([^/$_sep]*\)\.dylib$|-L\1 -l\2|g +s|\($2\)/lib\([^/$_sep]*\)\.dylib\([$_sep]\)|-L\1 -l\2\3|g +s|\($2\)/lib\([^/$_sep]*\)\.dylib$|-L\1 -l\2|g EOF ;; esac |