From 1a29744d0da8aa945b96b234574e0d5c80f13b62 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Tue, 2 Feb 2016 11:38:42 +1000 Subject: makepkg: Remove upx and optipng support These options were added before libmakepkg allowed passes like this to be dropped in. I prefer only real core packaging tasks to be included in makepkg and additional things like this to be dropped in by a user or distribution that wants to support them. Signed-off-by: Allan McRae --- doc/PKGBUILD.5.txt | 6 ------ doc/makepkg.conf.5.txt | 10 +--------- 2 files changed, 1 insertion(+), 15 deletions(-) (limited to 'doc') diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index e410481b..e19a81c9 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -293,12 +293,6 @@ underscore and the architecture name e.g., 'replaces_x86_64=()'. *zipman*;; Compress man and info pages with gzip. - *upx*;; - Compress binary executable files using UPX. - - *optipng*;; - Optimize PNG images with optipng. - *ccache*;; Allow the use of ccache during build. More useful in its negative form `!ccache` with select packages that have problems building diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index e35eb8a6..5bd3472f 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -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 !upx !optipng**)**:: +**OPTIONS=(**strip docs libtool staticlibs emptydirs zipman purge**)**:: 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 @@ -178,14 +178,6 @@ Options Remove files specified by the `PURGE_TARGETS` variable from the package. - *upx*;; - Compress binary executable files using UPX. Additional options - can be passed to UPX by specifying the `UPXFLAGS` array variable. - - *optipng*;; - Optimize PNG images with optipng. Additional options can be passed - to optipng by specifying the `OPTIPNGFLAGS` array variable. - *debug*;; Add the user-specified debug flags as specified in DEBUG_CFLAGS and DEBUG_CXXFLAGS to their counterpart buildflags. Creates a separate -- cgit v1.2.3-70-g09d2