diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-02-10 05:33:52 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-02-10 05:33:52 +0000 |
| commit | be06833cb95c312db84a220439eb3c84cdd23154 (patch) | |
| tree | ba7a70ed98cb88bbd9d808b5bef82accfcb95502 /cnf | |
| parent | Fix CHOST masking logic wrt installed packages so that it's consistent (diff) | |
| download | portage-multirepo-be06833cb95c312db84a220439eb3c84cdd23154.tar.gz portage-multirepo-be06833cb95c312db84a220439eb3c84cdd23154.tar.bz2 portage-multirepo-be06833cb95c312db84a220439eb3c84cdd23154.zip | |
Fix rejects.
svn path=/main/trunk/; revision=9326
Diffstat (limited to 'cnf')
| -rw-r--r-- | cnf/make.conf.sparc-fbsd.diff | 8 | ||||
| -rw-r--r-- | cnf/make.conf.x86-fbsd.diff | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/cnf/make.conf.sparc-fbsd.diff b/cnf/make.conf.sparc-fbsd.diff index d71178ab..4ca3a50c 100644 --- a/cnf/make.conf.sparc-fbsd.diff +++ b/cnf/make.conf.sparc-fbsd.diff @@ -23,10 +23,10 @@ # Portage Directories # =================== -@@ -279,7 +286,8 @@ - # 'notitles' disables xterm titlebar updates (which contain status info). - # 'parallel-fetch' - # do fetching in parallel to compilation +@@ -272,7 +286,8 @@ + # 'preserve-libs' + # keep libraries around that would normally removed by an upgrade, + # but are still needed by other packages -# 'sandbox' enables sandboxing when running emerge and ebuild. +# 'sandbox' enables sandboxing when running emerge and ebuild. Doesn't +# work on *BSD-based systems. diff --git a/cnf/make.conf.x86-fbsd.diff b/cnf/make.conf.x86-fbsd.diff index c2cf7cb7..a71e5403 100644 --- a/cnf/make.conf.x86-fbsd.diff +++ b/cnf/make.conf.x86-fbsd.diff @@ -63,10 +63,10 @@ # Portage Directories # =================== -@@ -279,7 +313,8 @@ - # 'notitles' disables xterm titlebar updates (which contain status info). - # 'parallel-fetch' - # do fetching in parallel to compilation +@@ -272,7 +313,8 @@ + # 'preserve-libs' + # keep libraries around that would normally removed by an upgrade, + # but are still needed by other packages -# 'sandbox' enables sandboxing when running emerge and ebuild. +# 'sandbox' enables sandboxing when running emerge and ebuild. Doesn't +# work on *BSD-based systems. |