aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2020-05-18 17:59:10 -0700
committerMatt Turner <mattst88@gentoo.org>2020-10-20 18:07:32 -0700
commitf9ec6eb347542d35208a94a07af155dcd473e4e1 (patch)
treecd7a580053a7be0a4210d14018a2d39c0d6f5de7 /doc
parentcatalyst: Set jobs/load-average via catalyst.conf (diff)
downloadcatalyst-f9ec6eb347542d35208a94a07af155dcd473e4e1.tar.gz
catalyst-f9ec6eb347542d35208a94a07af155dcd473e4e1.tar.bz2
catalyst-f9ec6eb347542d35208a94a07af155dcd473e4e1.zip
catalyst: Configure distcc_hosts in the config file
distcc_hosts are independent of the build itself, and therefore should be configured system-wide in catalyst.conf and not in each spec file. Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/catalyst-config.5.txt7
-rw-r--r--doc/catalyst-spec.5.txt6
2 files changed, 6 insertions, 7 deletions
diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index cbef6092..570d42c2 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -78,7 +78,7 @@ be closed invalid.
distcc::
Enable distcc support for building. You have to set distcc_hosts in
-your spec file.
+your config file.
icecream::
Enable icecream compiler cluster support for building.
@@ -136,6 +136,11 @@ written to the target's make.conf if it is not the default value of
Other settings
~~~~~~~~~~~~~~
+*distcc_hosts*::
+These are the hosts used as distcc slaves when distcc is enabled in
+your `catalyst.conf` (example: `127.0.0.1 192.168.0.1`). It follows
+the same syntax as `distcc-config --set-hosts`.
+
*jobs*::
Integral value passed to *emerge(1)* as the parameter to --jobs and is
used to define *MAKEOPTS* during the target build.
diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
index 43cd5d2f..31e69820 100644
--- a/doc/catalyst-spec.5.txt
+++ b/doc/catalyst-spec.5.txt
@@ -74,12 +74,6 @@ This specifies where the seed stage for this target comes from
`$storedir/builds`. The `rel_type` is also used as a path prefix for
the seed.
-*distcc_hosts*::
-These are the hosts used as distcc slaves when distcc is enabled in
-your `catalyst.conf` (example: `127.0.0.1 192.168.0.1`). It follows
-the same syntax as `distcc-config --set-hosts` and is entirely
-optional.
-
*portage_confdir*::
This is an optional directory containing portage configuration files
(example: `/etc/portage`). It follows the same syntax as