[gentoo-commits] proj/portage:master commit in: cnf/, man/

[gentoo-commits] proj/portage:master commit in: cnf/, man/

[Mike Frysinger]

commit:     d85f5c8c38c0dd296ef09b4b34bb40e20e84f2a8
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 10:47:45 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu May 14 10:49:11 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=d85f5c8c

make.conf: point people to ccache(1) for cache size details

Rather than duplicate documentation for how ccache's -M flag behaves,
point people directly to the ccache(1) man page for details.

Also increase the default to 5GiB to better match current ccache.

X-Gentoo-Bug: 539510
X-Gentoo-Bug-url: https://bugs.gentoo.org/539510
Reported-by: Toralf Förster <toralf.foerster <AT> gmx.de>

 cnf/make.conf.example | 6 +++---
 man/make.conf.5       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cnf/make.conf.example b/cnf/make.conf.example
index 70384c6..b897f02 100644
--- a/cnf/make.conf.example
+++ b/cnf/make.conf.example
@@ -280,10 +280,10 @@
 # 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 limitations for ccache. The default size depends
+#     on ccache itself; see the -M flag in the ccache(1) man page for details.
 #
-#CCACHE_SIZE="512M"
+#CCACHE_SIZE="5GiB"
 #
 # CCACHE_DIR sets the ccache path.  If not specified, portage will default
 #     to "${PORTAGE_TMPDIR}/ccache".

diff --git a/man/make.conf.5 b/man/make.conf.5
index 298eb80..a7417f3 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -122,8 +122,8 @@ man page for more information.
 Defaults to /var/tmp/ccache
 .TP
 \fBCCACHE_SIZE\fR = \fI"size"\fR
-This controls the space use limitations for ccache.  The default is 2 gigabytes
-('2G').  Sizes are specified with 'G', 'M', or 'K'.
+This controls the space use limitations for ccache.  See the \fI\-M\fR flag in
+the \fBccache\fR(1) man page for more information.
 .TP
 .B CFLAGS CXXFLAGS
 Use these variables to set the desired optimization/CPU instruction settings

[gentoo-commits] proj/portage:master commit in: cnf/, man/

[Brian Dolbec]

commit:     0ae17fe11588c91003aa0e579a2fef42654cabfe
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 10:47:45 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu May 14 19:01:22 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=0ae17fe1

make.conf: point people to ccache(1) for cache size details

Rather than duplicate documentation for how ccache's -M flag behaves,
point people directly to the ccache(1) man page for details.

Also increase the default to 5GiB to better match current ccache.

X-Gentoo-Bug: 539510
X-Gentoo-Bug-url: https://bugs.gentoo.org/539510
Reported-by: Toralf Förster <toralf.foerster <AT> gmx.de>

 cnf/make.conf.example | 6 +++---
 man/make.conf.5       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cnf/make.conf.example b/cnf/make.conf.example
index 70384c6..b897f02 100644
--- a/cnf/make.conf.example
+++ b/cnf/make.conf.example
@@ -280,10 +280,10 @@
 # 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 limitations for ccache. The default size depends
+#     on ccache itself; see the -M flag in the ccache(1) man page for details.
 #
-#CCACHE_SIZE="512M"
+#CCACHE_SIZE="5GiB"
 #
 # CCACHE_DIR sets the ccache path.  If not specified, portage will default
 #     to "${PORTAGE_TMPDIR}/ccache".

diff --git a/man/make.conf.5 b/man/make.conf.5
index 298eb80..a7417f3 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -122,8 +122,8 @@ man page for more information.
 Defaults to /var/tmp/ccache
 .TP
 \fBCCACHE_SIZE\fR = \fI"size"\fR
-This controls the space use limitations for ccache.  The default is 2 gigabytes
-('2G').  Sizes are specified with 'G', 'M', or 'K'.
+This controls the space use limitations for ccache.  See the \fI\-M\fR flag in
+the \fBccache\fR(1) man page for more information.
 .TP
 .B CFLAGS CXXFLAGS
 Use these variables to set the desired optimization/CPU instruction settings