tricky bsd.port.mk diff: differentiate BUILD_PACKAGES

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

tricky bsd.port.mk diff: differentiate BUILD_PACKAGES

Marc Espie-2
As landry noticed, pkglocatedb will spew out a few errors due to
SHARED_LIBS only containing libraries that "exist".

I think it makes sense to restrict a few introspection targets to
actual stuff getting built, since the "other" subpackages may contain
interesting errors.

Any unwanted consequences ?

Index: bsd.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1171
diff -u -p -r1.1171 bsd.port.mk
--- bsd.port.mk 28 May 2012 09:54:18 -0000 1.1171
+++ bsd.port.mk 28 May 2012 11:01:00 -0000
@@ -1667,11 +1667,11 @@ check-register:
 .endif
 
 check-register-all:
-.for _S in ${MULTI_PACKAGES}
+.for _S in ${BUILD_PACKAGES}
  @cd ${.CURDIR} && SUBPACKAGE=${_S} PKGPATH=${PKGPATH} ${MAKE} check-register
 .endfor
 
-.for _S in ${MULTI_PACKAGES}
+.for _S in ${BUILD_PACKAGES}
 
 ${_CACHE_REPO}/${_PKGFILE${_S}}:
  @mkdir -p ${@D}
@@ -2035,7 +2035,7 @@ ${WRKINST}/.saved_libs: ${_FAKE_COOKIE}
  @${SUDO} ${_CHECK_LIB_DEPENDS} -O $@t && ${SUDO} mv $@t $@
 
 port-lib-depends-check: ${WRKINST}/.saved_libs
- @-${_cache_fragment}; for s in ${MULTI_PACKAGES}; do \
+ @-${_cache_fragment}; for s in ${BUILD_PACKAGES}; do \
  SUBPACKAGE=$$s ${MAKE} print-plist-with-depends \
  lib_depends_args=all-lib-depends-args \
  wantlib_args=fake-wantlib-args| \
@@ -2163,7 +2163,7 @@ _do_libs_too = NO_SHARED_LIBS=Yes
 .  endif
 
 _extra_info =
-.  for _s in ${MULTI_PACKAGES}
+.  for _s in ${BUILD_PACKAGES}
 _extra_info += PLIST${_s}='${PLIST${_s}}'
 _extra_info += DEPPATHS${_s}="`${SETENV} FLAVOR=${FLAVOR:Q} SUBPACKAGE=${_s} PKGPATH=${PKGPATH} ${MAKE} show-run-depends ${_do_libs_too}`"
 .  endfor
@@ -2176,7 +2176,7 @@ _internal-plist _internal-update-plist:
  INSTALL_PRE_COOKIE=${_INSTALL_PRE_COOKIE} \
  MAKE="${MAKE}" \
  PORTSDIR=${PORTSDIR} \
- FLAVORS='${FLAVORS}' MULTI_PACKAGES='${MULTI_PACKAGES}' \
+ FLAVORS='${FLAVORS}' MULTI_PACKAGES='${BUILD_PACKAGES}' \
  OKAY_FILES='${_FAKE_COOKIE} ${_INSTALL_PRE_COOKIE} ${WRKINST}/.saved_libs' \
  SHARED_ONLY="${SHARED_ONLY}" \
  OWNER=`id -u` \
@@ -2606,13 +2606,13 @@ print-plist-libs-with-depends:
  fi
 
 print-plist-all:
-.for _S in ${MULTI_PACKAGES}
+.for _S in ${BUILD_PACKAGES}
  @${ECHO_MSG} "===> ${FULLPKGNAME${_S}}"
  @${_PKG_CREATE} -n -q ${PKG_ARGS${_S}} ${_PACKAGE_COOKIE${_S}}
 .endfor
 
 print-plist-all-with-depends:
-.for _S in ${MULTI_PACKAGES}
+.for _S in ${BUILD_PACKAGES}
  @${ECHO_MSG} "===> ${FULLPKGNAME${_S}}"
  @if a=`SUBPACKAGE=${_S} PKGPATH=${PKGPATH} ${MAKE} print-package-args`; \
  then \