Index: bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.362 diff -u -r1.362 bsd.port.mk --- bsd.port.mk 2001/02/17 00:46:26 1.362 +++ bsd.port.mk 2001/03/14 20:17:12 @@ -504,6 +504,7 @@ GZIP_CMD?= /usr/bin/gzip -nf ${GZIP} LDCONFIG?= /sbin/ldconfig LN?= /bin/ln +LOCKF?= /usr/bin/lockf MKDIR?= /bin/mkdir -p MV?= /bin/mv RM?= /bin/rm @@ -519,6 +520,10 @@ # Used to print all the '===>' style prompts - override this to turn them off. ECHO_MSG?= ${ECHO} +# Used for dependency recursion with locks - replace with ${MAKE} to disable +# locking against parallell dependency builds. +DEPMAKE?= ${LOCKF} -k Makefile ${MAKE} + # Get the architecture .if !defined(ARCH) ARCH!= ${UNAME} -m @@ -2515,7 +2520,7 @@ if [ ! -d "$$dir" ]; then \ ${ECHO_MSG} " >> No directory for $$prog. Skipping.."; \ else \ - (cd $$dir; ${MAKE} $$target $$depends_args) ; \ + (cd $$dir && ${DEPMAKE} $$target $$depends_args) ; \ ${ECHO_MSG} "===> Returning to build of ${PKGNAME}"; \ fi; \ fi; \ @@ -2559,7 +2564,7 @@ if [ ! -d "$$dir" ]; then \ ${ECHO_MSG} " >> No directory for $$lib. Skipping.."; \ else \ - (cd $$dir; ${MAKE} $$target $$depends_args) ; \ + (cd $$dir && ${DEPMAKE} $$target $$depends_args) ; \ ${ECHO_MSG} "===> Returning to build of ${PKGNAME}"; \ if ${LDCONFIG} -r | ${GREP} -qwF -e "-l$$lib"; then \ ${TRUE}; \ @@ -2591,7 +2596,7 @@ if [ ! -d $$dir ]; then \ ${ECHO_MSG} " >> No directory for $$dir. Skipping.."; \ else \ - (cd $$dir; ${MAKE} $$target $$depends_args) ; \ + (cd $$dir && ${DEPMAKE} $$target $$depends_args) ; \ fi \ done @${ECHO_MSG} "===> Returning to build of ${PKGNAME}"