diff options
| author |   Nicholas Jones <carpaski@gentoo.org> | 2004-04-14 01:47:36 +0000 |
|---|---|---|
| committer | Nicholas Jones <carpaski@gentoo.org> | 2004-04-14 01:47:36 +0000 |
| commit | 0cef5e0e63ef62f2281f6e0114f7e41baa745fb8 (patch) | |
| tree | 3b9f2767e5a1aa706cdf7f37ca4cd34a8839405c /cnf | |
| parent | document {do,new}{init,conf,env}d functions (diff) | |
| download | portage-cvs-0cef5e0e63ef62f2281f6e0114f7e41baa745fb8.tar.gz portage-cvs-0cef5e0e63ef62f2281f6e0114f7e41baa745fb8.tar.bz2 portage-cvs-0cef5e0e63ef62f2281f6e0114f7e41baa745fb8.zip | |
Lots of little updates and fixes. See the changelog...
portage-2.0.51_pre3
Diffstat (limited to 'cnf')
| -rw-r--r-- | cnf/dispatch-conf.conf | 2 | ||||
| -rw-r--r-- | cnf/make.conf | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cnf/dispatch-conf.conf b/cnf/dispatch-conf.conf index 86e9a9b..663384a 100644 --- a/cnf/dispatch-conf.conf +++ b/cnf/dispatch-conf.conf @@ -10,7 +10,7 @@ archive-dir=/etc/config-archive use-rcs=no # Diff for display -diff="diff -Nau %s %s" +diff="diff -Nu %s %s" # Pager for diff display pager="less --no-init --QUIT-AT-EOF" diff --git a/cnf/make.conf b/cnf/make.conf index 882bd9d..228086e 100644 --- a/cnf/make.conf +++ b/cnf/make.conf @@ -1,6 +1,6 @@ # Copyright 2000-2003 Daniel Robbins, Gentoo Technologies, Inc. # Contains local system settings for Portage system -# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf,v 1.71 2004/03/13 13:35:58 genone Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf,v 1.72 2004/04/14 01:47:36 carpaski Exp $ # Please review 'man make.conf' for more information. @@ -25,10 +25,9 @@ # Host Setting # ============ # -# If you are using a Pentium Pro or greater processor, leave this line as-is; -# otherwise, change to i586, i486 or i386 as appropriate. All modern systems -# (even Athlons) should use "i686-pc-linux-gnu". All K6's are i586. -# +# Change this line as appropriate (i686, i586, i486 or i386). +# All modern systems (even Athlons) should use "i686-pc-linux-gnu". +# All K6's are i586. CHOST="i686-pc-linux-gnu" # Host and optimization settings @@ -271,7 +270,8 @@ CHOST="i686-pc-linux-gnu" # sandbox access violations for users. # 'usersandbox' enables sandboxing while portage is running under userpriv. # unpack -- for debugging purposes only. -#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork" +#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noclean noauto cvs keeptemp keepwork autoaddcvs" +#FEATURES="sandbox ccache distcc autoaddcvs" # # 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. |