From e145b916f2d1db9979c45ac1340f135317ee4678 Mon Sep 17 00:00:00 2001
From: Michael Marineau <mike@marineau.org>
Date: Wed, 6 Nov 2013 15:09:41 -0800
Subject: [PATCH] fix(catalyst.sh): Update catalyst build more aggressively.

Use 2*CPUs for the target load average but add load average throttling
to emerge in addition to make. Also work around how catalyst sets
FEATURES so we can disable extra locking for hopefully faster builds.
---
 build_library/catalyst.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/build_library/catalyst.sh b/build_library/catalyst.sh
index e5a2d642d6..8d53a23863 100644
--- a/build_library/catalyst.sh
+++ b/build_library/catalyst.sh
@@ -77,9 +77,14 @@ EOF
 }
 
 catalystrc() {
-echo "export MAKEOPTS='--jobs=${NUM_JOBS} --load-average=${NUM_JOBS}'"
-echo "export EMERGE_DEFAULT_OPTS=--jobs=${NUM_JOBS}"
-echo "export FEATURES='parallel-install -ebuild-locks'"
+local load=$((NUM_JOBS * 2))
+cat <<EOF
+export TERM='${TERM}'
+export MAKEOPTS='--jobs=${NUM_JOBS} --load-average=${load}'
+export EMERGE_DEFAULT_OPTS="\$MAKEOPTS"
+# Catalyst overrides FEATURES so set it's own variable instead.
+export clst_myfeatures='-ebuild-locks'
+EOF
 }
 
 # Common values for all stage spec files