summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2007-01-11 07:10:27 +0000
committerMarius Mauch <genone@gentoo.org>2007-01-11 07:10:27 +0000
commit6a32aafde481bbac2f558214c12e2f80716e6351 (patch)
tree9085bc3d018326ae8b5b173c6a4f15f66c5de7e3
parentcbf33c76205e97f6b287e6097127dd6ff8e09da1 (diff)
downloadportage-6a32aafde481bbac2f558214c12e2f80716e6351.tar.gz
portage-6a32aafde481bbac2f558214c12e2f80716e6351.tar.bz2
portage-6a32aafde481bbac2f558214c12e2f80716e6351.zip
Update CCACHE docs, patch by Ryan Hill (bug #156865)
svn path=/main/trunk/; revision=5543
-rw-r--r--cnf/make.conf27
-rw-r--r--man/make.conf.52
2 files changed, 20 insertions, 9 deletions
diff --git a/cnf/make.conf b/cnf/make.conf
index 5be65cc3b..7bff547ea 100644
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -246,7 +246,9 @@
# generates digests only when the 'digest' feature is enabled).
# 'buildpkg' causes binary packages to be created of all packages that
# are being merged.
-# 'ccache' enables ccache support via CC.
+# 'ccache' enable support for the dev-util/ccache package, which can
+# noticably decrease the time needed to remerge previously built
+# packages.
# 'confcache' enable confcache support; speeds up autotool based configure
# calls
# 'collision-protect'
@@ -298,16 +300,25 @@
# 'usersandbox' enables sandboxing while portage is running under userpriv.
#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork"
#FEATURES="sandbox ccache distcc distlocks"
+
+# CCACHE_SIZE and CCACHE_DIR are used to control the behavior of ccache, and
+# and are only used if "ccache" is in FEATURES.
+#
+# CCACHE_SIZE sets the space limitations for ccache. The default size is
+# "2G", or 2 gigabytes. Units are specified with 'G', 'M', or 'K'.
#
-# CCACHE_SIZE sets the space use limitations for ccache. The default size is
-# 2G, and will be set if not defined otherwise and ccache is in features.
-# Portage will set the default ccache dir if it is not present in the
-# user's environment, for userpriv it sets: ${PORTAGE_TMPDIR}/ccache
-# (/var/tmp/ccache), and for regular use the default is /root/.ccache.
-# Sizes are specified with 'G' 'M' or 'K'.
-# '2G' for 2 gigabytes, '2048M' for 2048 megabytes (same as 2G).
#CCACHE_SIZE="512M"
#
+# CCACHE_DIR sets the ccache path. If not specified, portage will default
+# to "${PORTAGE_TMPDIR}/ccache".
+#
+# Note that to display ccache statistics outside of portage, you must
+# remember to give the correct path to the cache.
+#
+# $ CCACHE_DIR=/var/tmp/ccache ccache -s
+#
+#CCACHE_DIR="${PORTAGE_TMPDIR}/ccache"
+
# DISTCC_DIR sets the temporary space used by distcc.
#DISTCC_DIR="${PORTAGE_TMPDIR}/.distcc"
diff --git a/man/make.conf.5 b/man/make.conf.5
index 2f526436c..304b5ea9e 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -133,7 +133,7 @@ Build binary packages for just packages in the system set.
.B ccache
Enable portage support for the ccache package. If the ccache dir is not
present in the user's environment, then portage will default to
-${PORTAGE_TMPDIR}/ccache (with \fIuserpriv\fR) and to /root/.ccache otherwise.
+${PORTAGE_TMPDIR}/ccache.
.TP
.B confcache
Enable confcache support; global configure caching, speeds up autotool based configure