aboutsummaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2024-01-15 21:06:36 -0800
committerZac Medico <zmedico@gentoo.org>2024-01-15 21:20:37 -0800
commit825db01b91a37dcd9890ee5bf9f462ea524ac5cc (patch)
tree4bba3f96c86a53047ed4b2d6bddc74447a7fb24a /man
parentbintree: use urllib provided attributes for hostname, user and password (diff)
downloadportage-825db01b91a37dcd9890ee5bf9f462ea524ac5cc.tar.gz
portage-825db01b91a37dcd9890ee5bf9f462ea524ac5cc.tar.bz2
portage-825db01b91a37dcd9890ee5bf9f462ea524ac5cc.zip
Add merge-wait FEATURES setting enabled by default
Add a new merge-wait FEATURES setting, enabled by default, which prevents packages from being merged while other packages are building. Previously, this behavior was already implemented for packages that satisfy direct or indirect dependencies of the system set. This feature can be disabled only for other packages which do not satisfy direct or indirect dependencies of the system set, in order to trade the possibility of random build failures for greater parallelism. Currently, it is known that having merge-wait disabled can cause "random" build failures for builds using setuptools when setuptools plugins are merged during the build. Bug: https://bugs.gentoo.org/663324 Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'man')
-rw-r--r--man/make.conf.516
1 files changed, 13 insertions, 3 deletions
diff --git a/man/make.conf.5 b/man/make.conf.5
index f527166da..20dc9cb52 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Mar 2023" "Portage @VERSION@" "Portage"
+.TH "MAKE.CONF" "5" "Jan 2024" "Portage @VERSION@" "Portage"
.SH "NAME"
make.conf \- custom settings for Portage
.SH "SYNOPSIS"
@@ -565,6 +565,15 @@ After a package is merged or unmerged, sync relevant files to
disk in order to avoid data\-loss in the event of a power failure.
This feature is enabled by default.
.TP
+.B merge\-wait
+Wait for all builds to complete before merging new packages, which only
+matters when using the \fBemerge\fR(1) \fB\-\-jobs\fR option. This
+feature is always effectively enabled and it cannot be disabled for
+packages that satisfy direct or indirect dependencies of the system
+set. For other packages, it can be disabled in order to trade the
+possibility of random build failures for greater parallelism.
+This feature is enabled by default.
+.TP
.B metadata\-transfer
Automatically perform a metadata transfer when `emerge \-\-sync` is run.
In versions of portage >=2.1.5, this feature is disabled by
@@ -637,8 +646,9 @@ terminal to view parallel-fetch progress.
.TP
.B parallel\-install
Use finer\-grained locks when installing packages, allowing for greater
-parallelization. For additional parallelization, disable
-\fIebuild\-locks\fR.
+parallelism. Note that \fIparallel\-install\fR currently has no effect
+unless \fImerge\-wait\fR is disabled. For additional parallelism,
+disable \fIebuild\-locks\fR.
.TP
.B pid\-sandbox
Isolate the process space for the ebuild processes. This makes it