summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam>2002-11-25 19:43:23 +0000
committerjlam <jlam>2002-11-25 19:43:23 +0000
commit786e6c4e9eae60e35455e565449e3262fdc0bce9 (patch)
treee940237d6b4851d8ddd803a32797b9f498282cbd /mk
parentda8b012349e1719cbce21128afc175d9349cc8b4 (diff)
downloadpkgsrc-786e6c4e9eae60e35455e565449e3262fdc0bce9.tar.gz
Don't match common delimiters ['";:] when doing matches for substitutions.
Addresses PR 19159 by grant@netbsd.org.
Diffstat (limited to 'mk')
-rw-r--r--mk/buildlink2/gen-transform.sh18
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