Add `tool' as an option for BUILDLINK3_DEPMETHOD. XXX WRONG! This was a provisional kludge to make stuff that abused buildlink3 (notably xmlcatmgr) cross-compile. Index: mk/buildlink3/bsd.buildlink3.mk =================================================================== RCS file: /cvsroot/pkgsrc/mk/buildlink3/bsd.buildlink3.mk,v retrieving revision 1.218 diff -p -u -r1.218 bsd.buildlink3.mk --- mk/buildlink3/bsd.buildlink3.mk 2 Feb 2013 01:04:59 -0000 1.218 +++ mk/buildlink3/bsd.buildlink3.mk 23 Apr 2013 13:29:19 -0000 @@ -202,6 +202,9 @@ _BLNK_ABIMETHOD.${_pkg_}= _BLNK_ADD_TO.A . elif !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mbuild) _BLNK_DEPMETHOD.${_pkg_}= _BLNK_ADD_TO.BUILD_DEPENDS _BLNK_ABIMETHOD.${_pkg_}= _BLNK_ADD_TO.BUILD_ABI_DEPENDS +. elif !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mtool) +_BLNK_DEPMETHOD.${_pkg_}= _BLNK_ADD_TO.TOOL_DEPENDS +#_BLNK_ABIMETHOD.${_pkg_}= _BLNK_ADD_TO.TOOL_ABI_DEPENDS # XXX? . endif . if defined(BUILDLINK_API_DEPENDS.${_pkg_}) && \ defined(BUILDLINK_PKGSRCDIR.${_pkg_}) @@ -220,7 +223,7 @@ ${_BLNK_ABIMETHOD.${_pkg_}}+= ${_abi_}:$ . endfor . endif .endfor -.for _depmethod_ in DEPENDS BUILD_DEPENDS ABI_DEPENDS BUILD_ABI_DEPENDS +.for _depmethod_ in DEPENDS BUILD_DEPENDS ABI_DEPENDS BUILD_ABI_DEPENDS TOOL_DEPENDS # TOOL_ABI_DEPENDS XXX? . if !empty(_BLNK_ADD_TO.${_depmethod_}) ${_depmethod_}+= ${_BLNK_ADD_TO.${_depmethod_}} . endif @@ -307,13 +310,20 @@ BUILDLINK_LIBDIRS.${_pkg_}?= lib${LIBABI # . if !defined(_BLNK_PKG_DBDIR.${_pkg_}) _BLNK_PKG_DBDIR.${_pkg_}?= # empty +. if !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mtool) +_BLNK_XXX_PKG_INFO= ${HOST_PKG_INFO} +_BLNK_XXX_PKG_DBDIR= ${_HOST_PKG_DBDIR} +.else +_BLNK_XXX_PKG_INFO= ${PKG_INFO} +_BLNK_XXX_PKG_DBDIR= ${_PKG_DBDIR} +.endif . for _depend_ in ${BUILDLINK_API_DEPENDS.${_pkg_}} . if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found) _BLNK_PKG_DBDIR.${_pkg_}!= \ - pkg=`${PKG_INFO} -E "${_depend_}" || ${TRUE}`; \ + pkg=`${_BLNK_XXX_PKG_INFO} -E "${_depend_}" || ${TRUE}`; \ case "$$pkg" in \ "") dir="_BLNK_PKG_DBDIR.${_pkg_}_not_found" ;; \ - *) dir="${_PKG_DBDIR}/$$pkg"; \ + *) dir="${_BLNK_XXX_PKG_DBDIR}/$$pkg"; \ if [ -f $$dir/+DEPOT ]; then \ dir=`${HEAD} -1 $$dir/+DEPOT`; \ fi ;; \ @@ -329,7 +339,7 @@ MAKEVARS+= _BLNK_PKG_DBDIR.${_pkg_} . if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found) _BLNK_PKG_INFO.${_pkg_}?= ${PKG_INFO_CMD} -K ${_BLNK_PKG_DBDIR.${_pkg_}:H} . else -_BLNK_PKG_INFO.${_pkg_}?= ${PKG_INFO_CMD} -K ${_PKG_DBDIR} +_BLNK_PKG_INFO.${_pkg_}?= ${PKG_INFO_CMD} -K ${_BLNK_XXX_PKG_DBDIR} . endif BUILDLINK_PKGNAME.${_pkg_}?= ${_BLNK_PKG_DBDIR.${_pkg_}:T}