summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>2003-01-06 09:04:29 +0000
committerjlam <jlam>2003-01-06 09:04:29 +0000
commit7db87325c50e9b7ed2e267bfe0a5ac90ab9d73c6 (patch)
treed3e4cebaa9185ef8bb922b70f821affd222b7460
parente9f861e85bc41ecb4802ee3f1fbfd63adee06704 (diff)
downloadpkgsrc-7db87325c50e9b7ed2e267bfe0a5ac90ab9d73c6.tar.gz
Fix buildlink2 leakage into installed libtool archives that has been going
on since 2002-10-30. This mostly affects KDE packages.
-rw-r--r--mk/buildlink2/gen-transform.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/mk/buildlink2/gen-transform.sh b/mk/buildlink2/gen-transform.sh
index 608e5f3b774..1067ccb547d 100644
--- a/mk/buildlink2/gen-transform.sh
+++ b/mk/buildlink2/gen-transform.sh
@@ -40,7 +40,7 @@ EOF
@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
@@ -57,12 +57,18 @@ EOF
;;
static)
case "$action" in
- transform|untransform)
+ transform)
@CAT@ >> $sedfile << EOF
s|$2\(/[^ "':;]*/lib[^ /"':;]*\.a\)[ ]|$3\1 |g
s|$2\(/[^ "':;]*/lib[^ /"':;]*\.a\)$|$3\1|g
EOF
;;
+ untransform)
+ @CAT@ >> $sedfile << EOF
+s|$3\(/[^ "':;]*/lib[^ /"':;]*\.a\)[ ]|$2\1 |g
+s|$3\(/[^ "':;]*/lib[^ /"':;]*\.a\)$|$2\1|g
+EOF
+ ;;
esac
;;
p)