diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-15 23:19:16 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-15 23:19:16 +0000 |
| commit | 4960dbf427c090fa03ed4d1bfa1966bc0d668ae4 (patch) | |
| tree | f078cd41ce0f22a049e2d88710b56ee07c6055a9 | |
| parent | 41a68fd862720cc610ba80551e4b87ac7beef893 (diff) | |
| download | portage-4960dbf427c090fa03ed4d1bfa1966bc0d668ae4.tar.gz portage-4960dbf427c090fa03ed4d1bfa1966bc0d668ae4.tar.bz2 portage-4960dbf427c090fa03ed4d1bfa1966bc0d668ae4.zip | |
Add some cross references between emerge's new parallel build options and
MAKEOPTS.
svn path=/main/trunk/; revision=11063
| -rw-r--r-- | man/emerge.1 | 4 | ||||
| -rw-r--r-- | man/make.conf.5 | 6 | ||||
| -rw-r--r-- | pym/_emerge/help.py | 9 |
3 files changed, 16 insertions, 3 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index fdf94c13c..bc9a7efc8 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -335,6 +335,10 @@ the related \fB\-\-skipfirst\fR option. .BR \-\-load\-average=LOAD Specifies that no new builds should be started if there are other builds running and the load average is at least LOAD (a floating-point number). +This option is recommended for use in combination with \fB\-\-jobs\fR in +order to avoid excess load. See \fBmake\fR(1) for information about +analogous options that should be configured via \fBMAKEOPTS\fR in +\fBmake.conf\fR(5). .TP .BR "\-\-newuse " (\fB\-N\fR) Tells emerge to include installed packages where USE flags have changed since diff --git a/man/make.conf.5 b/man/make.conf.5 index 2fa95f724..b3dc3c49d 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -378,8 +378,10 @@ package. Use this variable if you want to use parallel make. For example, if you have a dual\-processor system, set this variable to "\-j2" or "\-j3" for enhanced build performance with many packages. Suggested settings are -between \fICPUs+1\fR and \fI2*CPUs+1\fR. -For more information, see \fBmake\fR(1). +between \fICPUs+1\fR and \fI2*CPUs+1\fR. In order to avoid +excess load, the \fB\-\-load\-average\fR option is recommended. +For more information, see \fBmake\fR(1). Also see \fBemerge\fR(1) for +information about analogous \fB\-\-jobs\fR and \fB\-\-load\-average\fR options. .TP \fBNOCOLOR\fR = \fI["true" | "false"]\fR Defines if color should be disabled by default. diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index 756f9156b..bf6a13834 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -319,7 +319,14 @@ def help(myaction,myopts,havecolor=1): desc = "Specifies that no new builds should " + \ "be started if there are other builds " + \ "running and the load average is at " + \ - "least LOAD (a floating-point number)." + "least LOAD (a floating-point number). " + \ + "This option is recommended for use " + \ + "in combination with --jobs in " + \ + "order to avoid excess load. See " + \ + "make(1) for information about " + \ + "analogous options that should be " + \ + "configured via MAKEOPTS in " + \ + "make.conf(5)." for line in wrap(desc, desc_width): print desc_indent + line print |