diff options
| author | Que Quotion | 2018-08-30 10:42:56 +0900 |
|---|---|---|
| committer | Que Quotion | 2018-08-30 10:49:02 +0900 |
| commit | 00b4663035f5a907c5170253ce762f6df4ee7975 (patch) | |
| tree | 39dc35e8b4b179f79a45c8a871ececa20a9154a5 /opticonf.patch | |
| parent | 32fa78c289e0c3f0ae564a73f2045de2dadb4ae5 (diff) | |
| download | aur-00b4663035f5a907c5170253ce762f6df4ee7975.tar.gz | |
Migrate makepkg-optimize2 into makepkg-optimize; this is the best way to deal with my out-of-date troll and pacman-build_env-ext
Diffstat (limited to 'opticonf.patch')
| -rw-r--r-- | opticonf.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/opticonf.patch b/opticonf.patch deleted file mode 100644 index a768fa64d81..00000000000 --- a/opticonf.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- makepkg-optimize -+++ makepkg-optimize -@@ -1862,7 +1862,7 @@ - printf -- "$(gettext " -V, --version Show version information and exit")\n" - printf -- "$(gettext " --allsource Generate a source-only tarball including downloaded sources")\n" - printf -- "$(gettext " --check Run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" -- printf -- "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" -+ printf -- "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg-optimize.conf" - printf -- "$(gettext " --holdver Do not update VCS sources")\n" - printf -- "$(gettext " --key <key> Specify a key to use for %s signing instead of the default")\n" "gpg" - printf -- "$(gettext " --noarchive Do not create package archive")\n" -@@ -2010,8 +2010,8 @@ - [[ -n ${PACKAGER} ]] && _PACKAGER=${PACKAGER} - [[ -n ${CARCH} ]] && _CARCH=${CARCH} - --# default config is makepkg.conf --MAKEPKG_CONF=${MAKEPKG_CONF:-$confdir/makepkg.conf} -+# default config is makepkg-optimize.conf -+MAKEPKG_CONF=${MAKEPKG_CONF:-$confdir/makepkg-optimize.conf} - - # Source the config file; fail if it is not found - if [[ -r $MAKEPKG_CONF ]]; then -@@ -2022,14 +2022,14 @@ - exit 1 # $E_CONFIG_ERROR - fi - --# Source user-specific makepkg.conf overrides, but only if no override config -+# Source user-specific makepkg-optimize.conf overrides, but only if no override config - # file was specified - XDG_PACMAN_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/pacman" --if [[ "$MAKEPKG_CONF" = "$confdir/makepkg.conf" ]]; then -- if [[ -r "$XDG_PACMAN_DIR/makepkg.conf" ]]; then -- source_safe "$XDG_PACMAN_DIR/makepkg.conf" -- elif [[ -r "$HOME/.makepkg.conf" ]]; then -- source_safe "$HOME/.makepkg.conf" -+if [[ "$MAKEPKG_CONF" = "$confdir/makepkg-optimize.conf" ]]; then -+ if [[ -r "$XDG_PACMAN_DIR/makepkg-optimize.conf" ]]; then -+ source_safe "$XDG_PACMAN_DIR/makepkg-optimize.conf" -+ elif [[ -r "$HOME/.makepkg-optimize.conf" ]]; then -+ source_safe "$HOME/.makepkg-optimize.conf" - fi - fi - |