svn commit: r377638 - projects/rework-dependency-registration/Mk

Baptiste Daroussin bapt at FreeBSD.org
Thu Jan 22 00:07:10 UTC 2015


Author: bapt
Date: Thu Jan 22 00:07:09 2015
New Revision: 377638
URL: https://svnweb.freebsd.org/changeset/ports/377638
QAT: https://qat.redports.org/buildarchive/r377638/

Log:
  Use ${SETENV} to set environment variable before calling the scripts

Modified:
  projects/rework-dependency-registration/Mk/bsd.port.mk

Modified: projects/rework-dependency-registration/Mk/bsd.port.mk
==============================================================================
--- projects/rework-dependency-registration/Mk/bsd.port.mk	Thu Jan 22 00:05:58 2015	(r377637)
+++ projects/rework-dependency-registration/Mk/bsd.port.mk	Thu Jan 22 00:07:09 2015	(r377638)
@@ -4473,7 +4473,7 @@ lib-depends:
 		target="${DEPENDS_TARGET}"; \
 		depends_args="${DEPENDS_ARGS}"; \
 		${ECHO_MSG}  -n "===>   ${PKGNAME} depends on shared library: $${lib}" ; \
-		libfile=`LIB_DIRS="${LIB_DIRS}" LOCALBASE="${LOCALBASE}" ${SH} ${SCRIPTSDIR}/find-lib.sh $${lib}` ; \
+		libfile=`${SETENV} LIB_DIRS="${LIB_DIRS}" LOCALBASE="${LOCALBASE}" ${SH} ${SCRIPTSDIR}/find-lib.sh $${lib}` ; \
 		if [ -z "$${libfile}" ]; then \
 			${ECHO_MSG} " - not found"; \
 			${ECHO_MSG} "===>    Verifying for $$lib in $$dir"; \
@@ -4793,7 +4793,7 @@ PACKAGE-DEPENDS-LIST?= \
 ACTUAL-PACKAGE-DEPENDS?= \
 	depfiles="" ; \
 	for lib in ${LIB_DEPENDS:C/\:.*//}; do \
-		depfiles="$$depfiles `LIB_DIRS="${LIB_DIRS}" LOCALBASE="${LOCALBASE}" ${SH} ${SCRIPTSDIR}/find-lib.sh $${lib}`" ; \
+		depfiles="$$depfiles `${SETENV} LIB_DIRS="${LIB_DIRS}" LOCALBASE="${LOCALBASE}" ${SH} ${SCRIPTSDIR}/find-lib.sh $${lib}`" ; \
 	done ; \
 	${SETENV} SCRIPTSDIR="${SCRIPTSDIR}" PKG_BIN="${PKG_BIN}" ${SH} ${SCRIPTSDIR}/actual-package-depends.sh $${depfiles} ${RUN_DEPENDS:C/(.*)\:.*/"\1"/}
 


More information about the svn-ports-all mailing list