[pacman-dev,9/9] relocalize using_ccache

Message ID 20181105135021.25250-1-quequotion@bugmenot.com
State Superseded, archived
Headers show
Series None | expand

Commit Message

Que Quotion Nov. 5, 2018, 1:50 p.m. UTC
From: Que Quotion <quequotion@gmail.com>

Should have done this a when putting the two functions together

Signed-off-by: Que Quotion <quequotion@gmail.com>
---
 scripts/libmakepkg/buildenv/compiler.sh.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Allan McRae Nov. 14, 2018, 1:47 a.m. UTC | #1
On 5/11/18 11:50 pm, Que Quotion wrote:
> From: Que Quotion <quequotion@gmail.com>
> 
> Should have done this a when putting the two functions together
> 
> Signed-off-by: Que Quotion <quequotion@gmail.com>
> ---
>  scripts/libmakepkg/buildenv/compiler.sh.in | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/scripts/libmakepkg/buildenv/compiler.sh.in b/scripts/libmakepkg/buildenv/compiler.sh.in
> index 38399269..e2b31916 100644
> --- a/scripts/libmakepkg/buildenv/compiler.sh.in
> +++ b/scripts/libmakepkg/buildenv/compiler.sh.in
> @@ -25,13 +25,12 @@ LIBMAKEPKG_BUILDENV_COMPILER_SH=1
>  
>  LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
>  
> -source "$LIBRARY/util/message.sh"
>  source "$LIBRARY/util/option.sh"
>  

Extra change unrelated to the patch.

>  build_options+=('ccache' 'distcc')
>  buildenv_functions+=('buildenv_ccache' 'buildenv_distcc')
>  
> -using_ccache=0
> +local using_ccache=0

This variable is set in a previous patch (I assume).   Fix it by
submitting a v2.


>  
>  buildenv_ccache() {
>  	if check_buildoption "ccache" "y"; then
>

Patch

diff --git a/scripts/libmakepkg/buildenv/compiler.sh.in b/scripts/libmakepkg/buildenv/compiler.sh.in
index 38399269..e2b31916 100644
--- a/scripts/libmakepkg/buildenv/compiler.sh.in
+++ b/scripts/libmakepkg/buildenv/compiler.sh.in
@@ -25,13 +25,12 @@  LIBMAKEPKG_BUILDENV_COMPILER_SH=1
 
 LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
 
-source "$LIBRARY/util/message.sh"
 source "$LIBRARY/util/option.sh"
 
 build_options+=('ccache' 'distcc')
 buildenv_functions+=('buildenv_ccache' 'buildenv_distcc')
 
-using_ccache=0
+local using_ccache=0
 
 buildenv_ccache() {
 	if check_buildoption "ccache" "y"; then