BUILD_ABI_DEPENDS also?

["Jeremy C. Reed" <reed%reedmedia.net@localhost>]

I noticed today that USE_ABI_DEPENDS=no (formerly IGNORE_RECOMMENDED=yes) 
still caused the BUILDLINK_ABI_DEPENDS.$pkg to be added to BUILD_DEPENDS.

Anyone care if I do this?

The fix is easy:

in mk/bsd.pkg.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


And:

diff -u -r1.173 bsd.buildlink3.mk
--- mk/buildlink3/bsd.buildlink3.mk     6 Apr 2006 06:23:06 -0000       1.173
+++ mk/buildlink3/bsd.buildlink3.mk     14 Apr 2006 07:09:32 -0000
@@ -185,13 +185,14 @@
 _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 @@
 .    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


 Jeremy C. Reed

echo ':6DB6=88>?;@69876tA=AC8BB5tA6487><' | tr '4-F' 'wu rofIn.lkigemca'