diff options
| author | reed <reed@pkgsrc.org> | 2006-05-06 03:28:44 +0000 |
|---|---|---|
| committer | reed <reed@pkgsrc.org> | 2006-05-06 03:28:44 +0000 |
| commit | a36ea4e941879283a4126c0fc8162d0377b858ff (patch) | |
| tree | c7ec49327ac49b7abe69dfb97853d88b54dbbe40 | |
| parent | b87f16416e36928a5836a3f08cd37e38fd857310 (diff) | |
| download | pkgsrc-a36ea4e941879283a4126c0fc8162d0377b858ff.tar.gz | |
If USE_ABI_DEPENDS=no, do not add the BUILDLINK_ABI_DEPENDS.$pkg
to BUILD_DEPENDS. (I posted about this to pkgsrc-users on April 14.)
| -rw-r--r-- | mk/bsd.pkg.mk | 5 | ||||
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 7df9150b26e..d53d177fa65 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1820 2006/04/26 05:58:44 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1821 2006/05/06 03:28:44 reed Exp $ # # This file is in the public domain. # @@ -768,9 +768,10 @@ USE_LANGUAGES?= # empty .include "../../mk/wrapper/bsd.wrapper.mk" -.if defined(ABI_DEPENDS) +.if defined(ABI_DEPENDS) || defined(BUILD_ABI_DEPENDS) . if !empty(USE_ABI_DEPENDS:M[yY][eE][sS]) DEPENDS+= ${ABI_DEPENDS} +BUILD_DEPENDS+= ${BUILD_ABI_DEPENDS} . else BUILD_DEFS+= USE_ABI_DEPENDS . endif diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 8a7f83c46b1..9ddff01c446 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.174 2006/04/14 16:59:04 jlam Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.175 2006/05/06 03:28:44 reed Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -185,13 +185,14 @@ _BLNK_DEPENDS_LIST= ${_BLNK_DEPENDS} _BLNK_ADD_TO.DEPENDS= # empty _BLNK_ADD_TO.BUILD_DEPENDS= # empty _BLNK_ADD_TO.ABI_DEPENDS= # empty +_BLNK_ADD_TO.BUILD_ABI_DEPENDS= # empty .for _pkg_ in ${_BLNK_DEPENDS_LIST} . if !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mfull) _BLNK_DEPMETHOD.${_pkg_}= _BLNK_ADD_TO.DEPENDS _BLNK_ABIMETHOD.${_pkg_}= _BLNK_ADD_TO.ABI_DEPENDS . elif !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mbuild) _BLNK_DEPMETHOD.${_pkg_}= _BLNK_ADD_TO.BUILD_DEPENDS -_BLNK_ABIMETHOD.${_pkg_}= _BLNK_ADD_TO.BUILD_DEPENDS +_BLNK_ABIMETHOD.${_pkg_}= _BLNK_ADD_TO.BUILD_ABI_DEPENDS . endif . if defined(BUILDLINK_API_DEPENDS.${_pkg_}) && \ defined(BUILDLINK_PKGSRCDIR.${_pkg_}) @@ -210,7 +211,7 @@ ${_BLNK_ABIMETHOD.${_pkg_}}+= ${_abi_}:${BUILDLINK_PKGSRCDIR.${_pkg_}} . endfor . endif .endfor -.for _depmethod_ in DEPENDS BUILD_DEPENDS ABI_DEPENDS +.for _depmethod_ in DEPENDS BUILD_DEPENDS ABI_DEPENDS BUILD_ABI_DEPENDS . if !empty(_BLNK_ADD_TO.${_depmethod_}) ${_depmethod_}+= ${_BLNK_ADD_TO.${_depmethod_}} . endif |