diff options
| author | jlam <jlam> | 2004-02-19 07:41:44 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-19 07:41:44 +0000 |
| commit | 464415072675c8c013aacd1c3017e1a947384c71 (patch) | |
| tree | d3e6a23bfa3f7aca0c86f6729efd269693937085 /mk | |
| parent | 5db9095befca4451f3f1f22327dab051ace5f9cd (diff) | |
| download | pkgsrc-464415072675c8c013aacd1c3017e1a947384c71.tar.gz | |
Don't spew files in the package directory if the BUILDLINK_DEPENDS.<pkg>
uses {} to list several "or" dependencies.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 10a6f704949..379eafd7ddf 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.94 2004/02/18 19:16:52 jlam Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.95 2004/02/19 07:41:44 jlam Exp $ # # An example package buildlink3.mk file: # @@ -133,8 +133,8 @@ _BLNK_DEPMETHOD.${_pkg_}= _BLNK_ADD_TO.BUILD_DEPENDS # see if it satisfies them all. The key fact is the the strictest # dependency, when converted to a pkg name, will satisfy every dependency. # -_BLNK_DEPENDS.${_pkg_}= ${BUILDLINK_DEPENDS.${_pkg_}:N*>=[0-9]*} -_BLNK_GE_DEPENDS.${_pkg_}= ${BUILDLINK_DEPENDS.${_pkg_}:M*>=[0-9]*} +_BLNK_DEPENDS.${_pkg_}= # empty +_BLNK_GE_DEPENDS.${_pkg_}= ${BUILDLINK_DEPENDS.${_pkg_}:N*{*:M*>=[0-9]*} _BLNK_STRICTEST_DEPENDS.${_pkg_}?= none . for _depend_ in ${_BLNK_GE_DEPENDS.${_pkg_}} . for _dep2pkg_ in ${_depend_:S/>=/-/} @@ -161,8 +161,13 @@ _BLNK_STRICTEST_DEPENDS.${_pkg_}= ${_depend_} # If the dependencies simply conflict, then pass them on through to the # normal dependency handling code. # -_BLNK_DEPENDS.${_pkg_}= ${BUILDLINK_DEPENDS.${_pkg_}} +_BLNK_DEPENDS.${_pkg_}+= ${BUILDLINK_DEPENDS.${_pkg_}} . else +. for _depend_ in ${BUILDLINK_DEPENDS.${_pkg_}} +. if empty(_BLNK_GE_DEPENDS.${_pkg_}:M${_depend_}) +_BLNK_DEPENDS.${_pkg_}+= ${_depend_} +. endif +. endfor _BLNK_DEPENDS.${_pkg_}+= ${_BLNK_STRICTEST_DEPENDS.${_pkg_}} . endif # |