Patchwork [V11,1/7] Build system fix distclean error for pixman

login
register
mail settings
Submitter Wayne Xia
Date Nov. 24, 2012, 9:27 a.m.
Message ID <1353749244-25676-2-git-send-email-xiawenc@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/201446/
State New
Headers show

Comments

Wayne Xia - Nov. 24, 2012, 9:27 a.m.
Currently Makefile test if pixman have configure log, but the script directly
return error if that file do not exist. This patch fix it.

v2: print out the command.
v3: resend as a stand alone fix patch, add reviewer.

  This patch have been sent as a stand alone fix for 1.3, if it is already
merged pls ignore it.

Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Blue Swirl - Nov. 24, 2012, 9:02 p.m.
Thanks, applied this patch only.

On Sat, Nov 24, 2012 at 9:27 AM, Wenchao Xia <xiawenc@linux.vnet.ibm.com> wrote:
>   Currently Makefile test if pixman have configure log, but the script directly
> return error if that file do not exist. This patch fix it.
>
> v2: print out the command.
> v3: resend as a stand alone fix patch, add reviewer.
>
>   This patch have been sent as a stand alone fix for 1.3, if it is already
> merged pls ignore it.
>
> Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 3e8d441..9ecbcbb 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -286,7 +286,7 @@ distclean: clean
>         for d in $(TARGET_DIRS) $(QEMULIBS); do \
>         rm -rf $$d || exit 1 ; \
>          done
> -       test -f pixman/config.log && make -C pixman distclean
> +       if test -f pixman/config.log; then make -C pixman distclean; fi
>
>  KEYMAPS=da     en-gb  et  fr     fr-ch  is  lt  modifiers  no  pt-br  sv \
>  ar      de     en-us  fi  fr-be  hr     it  lv  nl         pl  ru     th \
> --
> 1.7.1
>
>

Patch

diff --git a/Makefile b/Makefile
index 3e8d441..9ecbcbb 100644
--- a/Makefile
+++ b/Makefile
@@ -286,7 +286,7 @@  distclean: clean
 	for d in $(TARGET_DIRS) $(QEMULIBS); do \
 	rm -rf $$d || exit 1 ; \
         done
-	test -f pixman/config.log && make -C pixman distclean
+	if test -f pixman/config.log; then make -C pixman distclean; fi
 
 KEYMAPS=da     en-gb  et  fr     fr-ch  is  lt  modifiers  no  pt-br  sv \
 ar      de     en-us  fi  fr-be  hr     it  lv  nl         pl  ru     th \