diff options
| author | jlam <jlam> | 2004-01-05 21:50:13 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-01-05 21:50:13 +0000 |
| commit | ca60d8aced45953298671d9b1dd820577bb19076 (patch) | |
| tree | 5241b703156b969d80b0fe51490822aed3e83908 /mk/buildlink3 | |
| parent | 6d03cfcb68d6000d88df6b1040575a69016910e2 (diff) | |
| download | pkgsrc-ca60d8aced45953298671d9b1dd820577bb19076.tar.gz | |
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 (limited to 'mk/buildlink3')
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index d89a0bee6f1..3c272e50dc9 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -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 @@ BUILDLINK_LDFLAGS+= ${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_} . 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. |