diff options
| author | jlam <jlam> | 2003-08-31 06:07:33 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-08-31 06:07:33 +0000 |
| commit | f45f0f10b409cf0a8a5bca48d6bcd742d287097a (patch) | |
| tree | 9747bf7d6a23325771fc89da08104fc07f3268ff /mk/buildlink2 | |
| parent | cf5f46208c8ac8781583a382347bd7df30d75ade (diff) | |
| download | pkgsrc-f45f0f10b409cf0a8a5bca48d6bcd742d287097a.tar.gz | |
Strip bare -L${BUILDLINK_DIR}, -L${BUILDLINK_X11_DIR} and -L${WRKSRC}, as
well as stripping -L to subdirs of these directories from dependency_libs
lines in *.lai files. This corrects the changes in revision 1.18 of this
file and restores some functionality accidentally removed in version 1.19
of this file. Should fix the subversion buildlink/libtool problem
reported on tech-pkg@.
Diffstat (limited to 'mk/buildlink2')
| -rw-r--r-- | mk/buildlink2/libtool-fix-la | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mk/buildlink2/libtool-fix-la b/mk/buildlink2/libtool-fix-la index d1fba38a704..7096aaa21b8 100644 --- a/mk/buildlink2/libtool-fix-la +++ b/mk/buildlink2/libtool-fix-la @@ -1,4 +1,4 @@ -# $NetBSD: libtool-fix-la,v 1.19 2003/08/27 12:57:52 jlam Exp $ +# $NetBSD: libtool-fix-la,v 1.20 2003/08/31 06:07:33 jlam Exp $ # # For *.la files, in the "relink_command" line, we make the following # replacements: @@ -146,9 +146,11 @@ if $test -f $lafile; then ;; -L*) case "$i" in - -L${BUILDLINK_DIR}/*|-L${BUILDLINK_X11_DIR}/*) + -L${BUILDLINK_DIR}|-L${BUILDLINK_DIR}/*) ;; - -L@WRKSRC@/*) + -L${BUILDLINK_X11_DIR}|-L${BUILDLINK_X11_DIR}/*) + ;; + -L@WRKSRC@|-L@WRKSRC@/*) ;; *) case "$L" in |