From 00b66ec21bf0a4c148e31e90231695c220aa0a8a Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 14 Aug 2010 20:11:57 -0700
Subject: Disable EbuildIpcDaemon for now, since it seems to be triggering
 intermittent build failures in my stage builds. For testing purposes set
 PORTAGE_IPC_DAEMON_ENABLE=1 to enable EbuildIpcDaemon.

---
 bin/ebuild.sh             | 4 +++-
 bin/isolated-functions.sh | 3 ++-
 bin/misc-functions.sh     | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 18f96b655..c8161773b 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -748,7 +748,8 @@ dyn_clean() {
 		rm -f "$PORTAGE_BUILDDIR"/.{ebuild_changed,logid,unpacked,prepared} \
 			"$PORTAGE_BUILDDIR"/.{configured,compiled,tested,packaged} \
 			"$PORTAGE_BUILDDIR"/.die_hooks \
-			"$PORTAGE_BUILDDIR"/.ipc_{in,out,lock}
+			"$PORTAGE_BUILDDIR"/.ipc_{in,out,lock} \
+			"$PORTAGE_BUILDDIR"/.exit_status
 
 		rm -rf "${PORTAGE_BUILDDIR}/build-info"
 		rm -rf "${WORKDIR}"
@@ -2227,6 +2228,7 @@ elif [[ -n $EBUILD_SH_ARGS ]] ; then
 			chown portage:portage "$T/environment" &>/dev/null
 			chmod g+w "$T/environment" &>/dev/null
 		fi
+		[[ -n $PORTAGE_EBUILD_EXIT_FILE ]] && > "$PORTAGE_EBUILD_EXIT_FILE"
 		[[ -n $PORTAGE_IPC_DAEMON ]] && "$PORTAGE_BIN_PATH"/ebuild-ipc exit 0
 		exit 0
 	)
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index d484be1b6..53312dba8 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -192,6 +192,7 @@ die() {
 	fi
 	eerror "S: '${S}'"
 
+	[[ -n $PORTAGE_EBUILD_EXIT_FILE ]] && > "$PORTAGE_EBUILD_EXIT_FILE"
 	[[ -n $PORTAGE_IPC_DAEMON ]] && "$PORTAGE_BIN_PATH"/ebuild-ipc exit 1
 
 	# subshell die support
@@ -570,7 +571,7 @@ save_ebuild_env() {
 			PORTAGE_BASHRC PM_EBUILD_HOOK_DIR PORTAGE_BASHRCS_SOURCED \
 			PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \
 			PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \
-			PORTAGE_DEPCACHEDIR PORTAGE_GID \
+			PORTAGE_DEPCACHEDIR PORTAGE_EBUILD_EXIT_FILE PORTAGE_GID \
 			PORTAGE_GRPNAME PORTAGE_INST_GID \
 			PORTAGE_INST_UID PORTAGE_IPC_DAEMON \
 			PORTAGE_LOG_FILE PORTAGE_MASTER_PID \
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 0108b001f..3a199bdf7 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -872,6 +872,7 @@ if [ -n "${MISC_FUNCTIONS_ARGS}" ]; then
 		${x}
 	done
 	unset x
+	[[ -n $PORTAGE_EBUILD_EXIT_FILE ]] && > "$PORTAGE_EBUILD_EXIT_FILE"
 	[[ -n $PORTAGE_IPC_DAEMON ]] && "$PORTAGE_BIN_PATH"/ebuild-ipc exit 0
 fi
 
-- 
cgit v1.2.3-1-g7c22