[pkgsrc/trunk]: pkgsrc/mk/buildlink3 Do the right thing for pkgviews if we do...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/796a924a47e7
branches:  trunk
changeset: 465754:796a924a47e7
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jan 05 21:50:13 2004 +0000

description:
Do the right thing for pkgviews if we do binary package upgrades of
package dependencies by inserting the right default view directories into
the run-time library search path as well.

diffstat:

 mk/buildlink3/bsd.buildlink3.mk |  20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r 167af7e0fc1a -r 796a924a47e7 mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Mon Jan 05 21:29:14 2004 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Mon Jan 05 21:50:13 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.36 2004/01/05 11:05:47 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.37 2004/01/05 21:50:13 jlam Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -295,14 +295,22 @@
 .  endif
 .endfor
 #
-# Add the default view library directory to the runtime library search
+# Add the default view library directories to the runtime library search
 # path so that wildcard dependencies on library packages can always be
 # fulfilled through the default view.
 #
-.if (${_USE_RPATH} == "yes") && \
-    empty(BUILDLINK_LDFLAGS:M${_COMPILER_LD_FLAG}${RPATH_FLAG}${LOCALBASE}/lib)
-BUILDLINK_LDFLAGS+=    ${_COMPILER_LD_FLAG}${RPATH_FLAG}${LOCALBASE}/lib
-.endif
+.for _pkg_ in ${_BLNK_PACKAGES}
+.  if !empty(BUILDLINK_LIBDIRS.${_pkg_})
+.    for _dir_ in ${BUILDLINK_LIBDIRS.${_pkg_}:S/^/${LOCALBASE}\//}
+.      if exists(${_dir_})
+.        if (${_USE_RPATH} == "yes") && \
+           empty(BUILDLINK_LDFLAGS:M${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_})
+BUILDLINK_LDFLAGS+=    ${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_}
+.        endif
+.      endif
+.    endfor
+.  endif
+.endfor
 #
 # Add the X11 library directory to the runtime library search path if
 # the package uses X11.