diff options
| author | jlam <jlam@pkgsrc.org> | 2002-11-25 19:43:23 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-11-25 19:43:23 +0000 |
| commit | 450af8676e970e48f7d1cab23bd0ec8e60e93ca1 (patch) | |
| tree | e940237d6b4851d8ddd803a32797b9f498282cbd | |
| parent | 3e17105bda8b2117f2ceb751b76bfa15e1d02703 (diff) | |
| download | pkgsrc-450af8676e970e48f7d1cab23bd0ec8e60e93ca1.tar.gz | |
Don't match common delimiters ['";:] when doing matches for substitutions.
Addresses PR 19159 by grant@netbsd.org.
| -rw-r--r-- | mk/buildlink2/gen-transform.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mk/buildlink2/gen-transform.sh b/mk/buildlink2/gen-transform.sh index 355c53429bf..756fd55483d 100644 --- a/mk/buildlink2/gen-transform.sh +++ b/mk/buildlink2/gen-transform.sh @@ -33,14 +33,14 @@ gen() { @CAT@ >> $sedfile << EOF s|-$1$2[ ]$|-$1$3 |g s|-$1$2$|-$1$3|g -s|-$1$2\([^ ]*\)|-$1$3\1|g +s|-$1$2\([^ "':;]*\)|-$1$3\1|g EOF ;; untransform) @CAT@ >> $sedfile << EOF s|-$1$3[ ]$|-$1$2 |g s|-$1$3$|-$1$2|g -s|-$1$3\([^ ].*\)|-$1$2\1|g +s|-$1$3\([^ "':;].*\)|-$1$2\1|g EOF ;; esac @@ -59,8 +59,8 @@ EOF case "$action" in transform|untransform) @CAT@ >> $sedfile << EOF -s|$2\(/[^ ]*/lib[^ /]*\.a\)[ ]|$3\1 |g -s|$2\(/[^ ]*/lib[^ /]*\.a\)$|$3\1|g +s|$2\(/[^ "':;]*/lib[^ /"':;]*\.a\)[ ]|$3\1 |g +s|$2\(/[^ "':;]*/lib[^ /"':;]*\.a\)$|$3\1|g EOF ;; esac @@ -69,7 +69,7 @@ EOF case "$action" in transform|untransform) @CAT@ >> $sedfile << EOF -s|\($2/[^ ]*\)/lib\([^ /]*\)\.so|-L\1 -l\2|g +s|\($2/[^ "':;]*\)/lib\([^ /"':;]*\)\.so|-L\1 -l\2|g EOF ;; esac @@ -80,7 +80,7 @@ EOF @CAT@ >> $sedfile << EOF s|$2[ ]| |g s|$2$||g -s|$2[^ ]*||g +s|$2[^ "':;]*||g EOF ;; esac @@ -115,9 +115,9 @@ EOF case "$action" in transform|untransform) @CAT@ >> $sedfile << EOF -s|-Wl,-R[^ ]*||g -s|-Wl,-rpath,[^ ]*||g -s|-R[^ ]*||g +s|-Wl,-R[^ "':;]*||g +s|-Wl,-rpath,[^ "':;]*||g +s|-R[^ "':;]*||g EOF ;; esac |