[pkgsrc/trunk]: pkgsrc/mk/buildlink2 Strip bare -L${BUILDLINK_DIR}, -L${BUILD...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/604294797e6b
branches:  trunk
changeset: 460512:604294797e6b
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Aug 31 06:07:33 2003 +0000

description:
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:

 mk/buildlink2/libtool-fix-la |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (23 lines):

diff -r 26d9fbfc760d -r 604294797e6b mk/buildlink2/libtool-fix-la
--- a/mk/buildlink2/libtool-fix-la      Sun Aug 31 02:04:57 2003 +0000
+++ b/mk/buildlink2/libtool-fix-la      Sun Aug 31 06:07:33 2003 +0000
@@ -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 @@
                                ;;
                        -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