[Intel-gfx] [PATCH] igt: tests/Android.mk: fix LOCAL_PATH usage

Damien Lespiau damien.lespiau at intel.com
Tue Jan 14 18:57:07 CET 2014


On Tue, Jan 14, 2014 at 06:01:38PM +0000, robert.beckett at intel.com wrote:
> From: Robert Beckett <robert.beckett at intel.com>
> 
> Fix usage of shared variable LOCAL_PATH in deferred variable expansion area.

Out of curiosity, do you mind explaining what the late evaluation of
LOCAL_PATH broke? and why you didn't need to update the
$(LOCAL_PATH)/version.h targets?

Thanks,

-- 
Damien

> Signed-off-by: Robert Beckett <robert.beckett at intel.com>
> ---
>  tests/Android.mk |    7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/Android.mk b/tests/Android.mk
> index c65f94c..abccb7f 100644
> --- a/tests/Android.mk
> +++ b/tests/Android.mk
> @@ -22,6 +22,7 @@ skip_lib_list := \
>  
>  lib_list := $(filter-out $(skip_lib_list),$(libintel_tools_la_SOURCES))
>  LIB_SOURCES := $(addprefix lib/,$(lib_list))
> +GPU_TOOLS_PATH := $(LOCAL_PATH)
>  
>  .PHONY: version.h.tmp
>  
> @@ -38,10 +39,10 @@ $(LOCAL_PATH)/version.h.tmp:
>  
>  $(LOCAL_PATH)/version.h: $(LOCAL_PATH)/version.h.tmp
>  	@echo "updating version.h"
> -	@if ! cmp -s $(LOCAL_PATH)/version.h.tmp $(LOCAL_PATH)/version.h; then \
> -		mv $(LOCAL_PATH)/version.h.tmp $(LOCAL_PATH)/version.h ; \
> +	@if ! cmp -s $(GPU_TOOLS_PATH)/version.h.tmp $(GPU_TOOLS_PATH)/version.h; then \
> +		mv $(GPU_TOOLS_PATH)/version.h.tmp $(GPU_TOOLS_PATH)/version.h ; \
>  	else \
> -		rm $(LOCAL_PATH)/version.h.tmp ; \
> +		rm $(GPU_TOOLS_PATH)/version.h.tmp ; \
>  	fi
>  
>  # FIXME: autogenerate this info #
> -- 
> 1.7.9.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx



More information about the Intel-gfx mailing list