summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2017-09-26 12:16:39 -0400
committerAllan McRae <allan@archlinux.org>2017-12-07 14:58:53 +1000
commit44f3a157983e903f926b4f11ddb3f57d111e60f9 (patch)
treef7b7bd8d8cbc2fa768944b1288a4e0f5741dd020 /etc
parentab2be5794de8a57426ec3fc0f631cc766a0b8227 (diff)
downloadpacman-44f3a157983e903f926b4f11ddb3f57d111e60f9.tar.xz
makepkg.conf: correct the documentation on the default options
The documentation for OPTIONS and BUILDENV listed some incorrect defaults for undefined options. The defaults are implementation-defined in the source code for makepkg itself (e.g. it depends whether we use `check_option "opt" "y"` or `check_option "opt" "n"`) but were erroneously declared to be "whatever we *define* in the default makepkg.conf". Fixes FS#55754 Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'etc')
-rw-r--r--etc/makepkg.conf.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
index 71293970..f1ddabe0 100644
--- a/etc/makepkg.conf.in
+++ b/etc/makepkg.conf.in
@@ -48,7 +48,7 @@ CHOST="@CHOST@"
# BUILD ENVIRONMENT
#########################################################################
#
-# Defaults: BUILDENV=(!distcc color !ccache check !sign)
+# Defaults: BUILDENV=(!distcc !color !ccache check !sign)
# A negated environment option will do the opposite of the comments below.
#
#-- distcc: Use the Distributed C/C++/ObjC compiler
@@ -71,7 +71,7 @@ BUILDENV=(!distcc color !ccache check !sign)
# These are default values for the options=() settings
#########################################################################
#
-# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !debug)
+# Default: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug)
# A negated option will do the opposite of the comments below.
#
#-- strip: Strip symbols from binaries/libraries