Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 May 2012 12:01:36 +0000
From:      scher@FreeBSD.org
To:        svn-soc-all@FreeBSD.org
Subject:   socsvn commit: r236587 - soc2012/scher/par_ports/head/Mk
Message-ID:  <20120528120136.234951065672@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: scher
Date: Mon May 28 12:01:35 2012
New Revision: 236587
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=236587

Log:
  [new_feature] ${PKG_DBDIR} locking for port's registration phase.
  	new debugging barrier variable (some king of readln() )
  [fixed] WANT_PARALLEL_BUILD variable renamed to _parv_WANT_PARALLEL_BUILD
  	to suit parallel specific variables' names.
  
  Submitted by: Alexander Pronin

Modified:
  soc2012/scher/par_ports/head/Mk/bsd.parallel.mk
  soc2012/scher/par_ports/head/Mk/bsd.port.mk

Modified: soc2012/scher/par_ports/head/Mk/bsd.parallel.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.parallel.mk	Mon May 28 10:45:51 2012	(r236586)
+++ soc2012/scher/par_ports/head/Mk/bsd.parallel.mk	Mon May 28 12:01:35 2012	(r236587)
@@ -17,6 +17,11 @@
 _dparv_START_OUTPUT= ${ECHO_CMD} ${_dparv_START_OUTPUT_MESSAGE}
 _dparv_END_OUTPUT= ${ECHO_CMD} ${_dparv_END_OUTPUT_MESSAGE}
 
+# Use it when you need a barrier
+_dparv_DEBUGGING_BREAKPOINT= ${ECHO_CMD} Debugging breakpoint here...; \
+	${ECHO_CMD} Press any key when you are ready to continue; \
+	read non_existed_var
+
 # Delay for feedback message if the directory is locked.
 # Just not to annoy a user with feedback message on each attempt to lock a directory.
 _parv_ON_LOCK_FEEDBACK_TIMEOUT?= 2

Modified: soc2012/scher/par_ports/head/Mk/bsd.port.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.port.mk	Mon May 28 10:45:51 2012	(r236586)
+++ soc2012/scher/par_ports/head/Mk/bsd.port.mk	Mon May 28 12:01:35 2012	(r236587)
@@ -1133,7 +1133,7 @@
 # parallel build/install features
 #
 
-.if defined(WANT_PARALLEL_BUILD)
+.if defined(_parv_WANT_PARALLEL_BUILD)
 .include "${PORTSDIR}/Mk/bsd.parallel.mk"
 .endif
 
@@ -1527,9 +1527,9 @@
 
 ############### PAR_PORTS SPECIFIC COMMENT LINE ############### 
 #
-.if defined(WANT_PARALLEL_BUILD) || !defined(IGNORE_PATH_CHECKS)
+.if defined(_parv_WANT_PARALLEL_BUILD) || !defined(IGNORE_PATH_CHECKS)
 .BEGIN:
-.	if defined(WANT_PARALLEL_BUILD)
+.	if defined(_parv_WANT_PARALLEL_BUILD)
 .		if ${_parv_IS_DEFAULT_TARGET}
 	@attempts=-1; ${_parv_.CURDIR_LOCK_LOOP}
 .		endif
@@ -1542,9 +1542,9 @@
 	@${FALSE}
 .		endif
 .	endif
-.endif #defined(WANT_PARALLEL_BUILD) || !defined(IGNORE_PATH_CHECKS)
+.endif #defined(_parv_WANT_PARALLEL_BUILD) || !defined(IGNORE_PATH_CHECKS)
 
-.if defined(WANT_PARALLEL_BUILD)
+.if defined(_parv_WANT_PARALLEL_BUILD)
 .END:
 .	if ${_parv_IS_DEFAULT_TARGET}
 	@${_parv_.CURDIR_DO_UNLOCK}
@@ -5919,6 +5919,17 @@
 .if !target(fake-pkg)
 fake-pkg:
 .if !defined(NO_PKG_REGISTER)
+############### PAR_PORTS SPECIFIC COMMENT LINE ###############
+.if defined(_parv_WANT_PARALLEL_BUILD)
+	@( attempts=-1; ${_parv_PKG_DBDIR_LOCK_LOOP} ) || { \
+		status=$$?; \
+		${_dparv_START_OUTPUT}; \
+		${ECHO_CMD} Unable to lock ${PKG_DBDIR}. Exit status $${status}; \
+		${_dparv_END_OUTPUT}; \
+		exit 1; \
+	}
+.endif
+############### END OF PAR_PORTS SPECIFIC COMMENT LINE  ###############
 	@if [ ! -d ${PKG_DBDIR} ]; then ${RM} -f ${PKG_DBDIR}; ${MKDIR} ${PKG_DBDIR}; fi
 	@${RM} -f /tmp/${PKGNAME}-required-by
 .if defined(FORCE_PKG_REGISTER)
@@ -5964,6 +5975,17 @@
 		${CAT} /tmp/${PKGNAME}-required-by >> ${PKG_DBDIR}/${PKGNAME}/+REQUIRED_BY; \
 		${RM} -f /tmp/${PKGNAME}-required-by; \
 	fi
+############### PAR_PORTS SPECIFIC COMMENT LINE ###############
+.if defined(_parv_WANT_PARALLEL_BUILD)
+	@( ${_parv_PKG_DBDIR_DO_UNLOCK} ) || { \
+		status=$$?; \
+		${_dparv_START_OUTPUT}; \
+		${ECHO_CMD} Unable to unlock ${PKG_DBDIR}. Exit status $${status}; \
+		${_dparv_END_OUTPUT}; \
+		exit 1; \
+	}
+.endif
+############### END OF PAR_PORTS SPECIFIC COMMENT LINE  ###############
 .else
 	@${DO_NADA}
 .endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120528120136.234951065672>