diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2017-09-26 12:16:39 -0400 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2017-12-07 14:58:53 +1000 |
| commit | 44f3a157983e903f926b4f11ddb3f57d111e60f9 (patch) | |
| tree | f7b7bd8d8cbc2fa768944b1288a4e0f5741dd020 | |
| parent | ab2be5794de8a57426ec3fc0f631cc766a0b8227 (diff) | |
| download | pacman-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>
| -rw-r--r-- | doc/makepkg.conf.5.txt | 4 | ||||
| -rw-r--r-- | etc/makepkg.conf.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 5bd3472f..aa093401 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -92,7 +92,7 @@ Options **DEBUG_CXXFLAGS=**"debug_cxxflags":: Debug flags used for the C++ compiler; see DEBUG_CFLAGS for more info. -**BUILDENV=(**!distcc color !ccache check !sign**)**:: +**BUILDENV=(**!distcc !color !ccache check !sign**)**:: This array contains options that affect the build environment; the defaults are shown here. All options should always be left in the array; to enable or disable an option, simply remove or add an ``!'' at the front of the @@ -141,7 +141,7 @@ Options Specify a key to use for GPG signing instead of the default key in the keyring. Can be overridden with makepkg's '\--key' option. -**OPTIONS=(**strip docs libtool staticlibs emptydirs zipman purge**)**:: +**OPTIONS=(**!strip docs libtool staticlibs emptydirs !zipman !purge !debug**)**:: This array contains options that affect default packaging. They are equivalent to options that can be placed in the PKGBUILD; the defaults are shown here. All options should always be left in the array; to enable or 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 |