| 1 |
Author: zmedico |
| 2 |
Date: 2008-08-01 02:09:22 +0000 (Fri, 01 Aug 2008) |
| 3 |
New Revision: 11305 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/cnf/make.conf |
| 7 |
main/trunk/man/make.conf.5 |
| 8 |
Log: |
| 9 |
Remove the list of FEATURES descriptions from make.conf.example and replace |
| 10 |
it with a reference to the make.conf(5) man page. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/cnf/make.conf |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/cnf/make.conf 2008-08-01 01:44:10 UTC (rev 11304) |
| 16 |
+++ main/trunk/cnf/make.conf 2008-08-01 02:09:22 UTC (rev 11305) |
| 17 |
@@ -236,61 +236,11 @@ |
| 18 |
# packages. Do not use it unless absolutely necessary! |
| 19 |
#AUTOCLEAN="yes" |
| 20 |
# |
| 21 |
-# FEATURES are settings that affect the functionality of portage. Most of |
| 22 |
-# these settings are for developer use, but some are available to non- |
| 23 |
-# developers as well. |
| 24 |
-# |
| 25 |
-# 'buildpkg' causes binary packages to be created of all packages that |
| 26 |
-# are being merged. |
| 27 |
-# 'buildsyspkg' only build binary packages for system packages. |
| 28 |
-# 'ccache' enable support for the dev-util/ccache package, which can |
| 29 |
-# noticably decrease the time needed to remerge previously built |
| 30 |
-# packages. |
| 31 |
-# 'collision-protect' |
| 32 |
-# prevents packages from overwriting files that are owned by |
| 33 |
-# another package or by no package at all. |
| 34 |
-# 'distcc' enables distcc support via CC. |
| 35 |
-# 'distlocks' enables distfiles locking using fcntl or hardlinks. This |
| 36 |
-# is enabled by default. Tools exist to help clean the locks |
| 37 |
-# after crashes: /usr/lib/portage/bin/clean_locks. |
| 38 |
-# 'installsources' |
| 39 |
-# Install source code into /usr/src/debug/${CATEGORY}/${PF} |
| 40 |
-# (also see 'splitdebug'). This feature works only if debugedit |
| 41 |
-# is installed and CFLAGS is set to include debug information |
| 42 |
-# (such as with the -ggdb flag). |
| 43 |
-# 'test' causes ebuilds to perform testing phases if they are capable |
| 44 |
-# of it. Some packages support this automatically via makefiles. |
| 45 |
-# 'metadata-transfer' |
| 46 |
-# automatically perform a metadata transfer when `emerge --sync` |
| 47 |
-# is run. |
| 48 |
-# 'noauto' causes ebuild to perform only the action requested and |
| 49 |
-# not any other required actions like clean or unpack -- for |
| 50 |
-# debugging purposes only. |
| 51 |
-# 'nostrip' prevents the stripping of binaries. |
| 52 |
-# 'notitles' disables xterm titlebar updates (which contain status info). |
| 53 |
-# 'parallel-fetch' |
| 54 |
-# do fetching in parallel to compilation |
| 55 |
-# 'preserve-libs' |
| 56 |
-# keep libraries around that would normally removed by an upgrade, |
| 57 |
-# but are still needed by other packages |
| 58 |
-# 'sandbox' enables sandboxing when running emerge and ebuild. |
| 59 |
-# 'splitdebug' Prior to stripping ELF etdyn and etexec files, the debugging |
| 60 |
-# info is stored for later use by various debuggers. This |
| 61 |
-# feature is disabled by 'nostrip'. For installation of source |
| 62 |
-# code, see 'installsources'. |
| 63 |
-# 'strict' causes portage to react strongly to conditions that are |
| 64 |
-# potentially dangerous, like missing/incorrect Manifest files. |
| 65 |
-# 'stricter' causes portage to react strongly to conditions that may |
| 66 |
-# conflict with system security provisions (for example |
| 67 |
-# textrels, executable stacks). |
| 68 |
-# 'userfetch' when portage is run as root, drop privileges to |
| 69 |
-# portage:portage during the fetching of package sources. |
| 70 |
-# 'userpriv' allows portage to drop root privileges while it is compiling, |
| 71 |
-# as a security measure. As a side effect this can remove |
| 72 |
-# sandbox access violations for users. |
| 73 |
-# 'usersandbox' enables sandboxing while portage is running under userpriv. |
| 74 |
-#FEATURES="sandbox buildpkg ccache distcc userpriv usersandbox notitles noauto" |
| 75 |
-#FEATURES="sandbox ccache distcc distlocks" |
| 76 |
+# FEATURES defines actions portage takes by default. This is an incremental |
| 77 |
+# variable. See the make.conf(5) man page for a complete list of supported |
| 78 |
+# values and their respective meanings. |
| 79 |
+#FEATURES="ccache collision-protect distcc installsources \ |
| 80 |
+# splitdebug test userpriv usersandbox" |
| 81 |
|
| 82 |
# CCACHE_SIZE and CCACHE_DIR are used to control the behavior of ccache, and |
| 83 |
# and are only used if "ccache" is in FEATURES. |
| 84 |
|
| 85 |
Modified: main/trunk/man/make.conf.5 |
| 86 |
=================================================================== |
| 87 |
--- main/trunk/man/make.conf.5 2008-08-01 01:44:10 UTC (rev 11304) |
| 88 |
+++ main/trunk/man/make.conf.5 2008-08-01 02:09:22 UTC (rev 11305) |
| 89 |
@@ -143,10 +143,10 @@ |
| 90 |
script arguments (see \fBebuild\fR(5)). |
| 91 |
.TP |
| 92 |
\fBFEATURES\fR = \fI"sandbox ccache"\fR |
| 93 |
-Defines actions portage takes by default. These options should |
| 94 |
-not be changed by anyone but developers and/or maintainers. 'sandbox' is an important |
| 95 |
-part of \fBFEATURES\fR and should not be disabled by default. This is |
| 96 |
-an incremental variable. |
| 97 |
+Defines actions portage takes by default. This is an incremental variable. |
| 98 |
+Most of these settings are for developer use, but some are available to |
| 99 |
+non-developers as well. The \fBsandbox\fR feature is very important and |
| 100 |
+should not be disabled by default. |
| 101 |
.RS |
| 102 |
.TP |
| 103 |
.B assume\-digests |
Archives