[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Don't treat ${BUILDLINK_DIR} like a loca...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0f136e165e4f
branches:  trunk
changeset: 473815:0f136e165e4f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Apr 24 22:04:46 2004 +0000

description:
Don't treat ${BUILDLINK_DIR} like a local directory in the "${WRKSRC} ==
${WRKDIR}" case when converting references to local libtool archives into
the full paths.

diffstat:

 mk/buildlink3/libtool-post-cache |  7 +++++--
 mk/buildlink3/libtool-post-logic |  7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r 6ce89c069aff -r 0f136e165e4f mk/buildlink3/libtool-post-cache
--- a/mk/buildlink3/libtool-post-cache  Sat Apr 24 22:03:55 2004 +0000
+++ b/mk/buildlink3/libtool-post-cache  Sat Apr 24 22:04:46 2004 +0000
@@ -1,11 +1,14 @@
-# $NetBSD: libtool-post-cache,v 1.3 2004/03/30 17:25:19 jlam Exp $
+# $NetBSD: libtool-post-cache,v 1.4 2004/04/24 22:04:46 jlam Exp $
 #
 # This file implements the default action of the "libtool" private
 # cache.
 
 # Skip the common cache lookup for all directories and library args that
-# may reference a locally-linked libtool archive.
+# may reference a locally-linked libtool archive.  Avoid matching the
+# buildlink directory here for the WRKSRC == WRKDIR case.
 #
+-L${BUILDLINK_DIR}/*)
+       ;;
 -L.|-L./*|-L..*|-L[!/]*|-L${WRKSRC}*|-l*)
        skipcache=yes
        ;;
diff -r 6ce89c069aff -r 0f136e165e4f mk/buildlink3/libtool-post-logic
--- a/mk/buildlink3/libtool-post-logic  Sat Apr 24 22:03:55 2004 +0000
+++ b/mk/buildlink3/libtool-post-logic  Sat Apr 24 22:04:46 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: libtool-post-logic,v 1.6 2004/04/22 22:28:19 snj Exp $
+# $NetBSD: libtool-post-logic,v 1.7 2004/04/24 22:04:46 jlam Exp $
 
 case $arg in
 #
@@ -14,8 +14,11 @@
 # We convert the former into the latter by remembering all "local"
 # directories that are mentioned in -L* arguments to to libtool
 # wrapper, and checking to see if <dir>/libfoo.la exists when we see
-# "-lfoo" on the libtool command line.
+# "-lfoo" on the libtool command line.  Avoid matching the buildlink
+# directory here for the WRKSRC == WRKDIR case.
 #
+-L${BUILDLINK_DIR}/*)
+       ;;
 -L.|-L./*|-L..*|-L[!/]*|-L${WRKSRC}*)
        case $fixlibpath in
        yes)