Re: [Mesa-dev] [PATCH] automake: get in-tree `make distclean' working again.

2016-06-09 Thread Emil Velikov 
On 8 June 2016 at 16:23, Eric Engestrom  wrote:
> On Wed, Jun 08, 2016 at 03:44:39PM +0100, Emil Velikov wrote:
>> From: Emil Velikov 
>>
>> With earlier commit we've handled the `make distclean' out of tree
>> build, yet we failed to attribute that for in-tree builds the test
>> condition will return 1. Thus effectively the target will be considered
>> as "failed".
>>
>> Fixes: b7f7ec78435 ("mesa: automake: distclean git_sha1.h when building
>> OOT")
>> Cc: 
>> Cc: Andy Furniss 
>> Reported-by: Andy Furniss 
>> Signed-off-by: Emil Velikov 
>> ---
>> Thanks for catching this Andy. The following seems to work fine here.
>> Can you give it a try on you end ?
>>
>> Emil
>> ---
>>  src/Makefile.am | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/src/Makefile.am b/src/Makefile.am
>> index 0527a31..32372da 100644
>> --- a/src/Makefile.am
>> +++ b/src/Makefile.am
>> @@ -50,7 +50,7 @@ BUILT_SOURCES = git_sha1.h
>>  # At the same time `make distclean' gets angry at us if we don't cleanup the
>>  # builddir one.
>>  distclean-local:
>> - test $(top_srcdir) != $(top_builddir) && rm $(builddir)/git_sha1.h
>> + ( test $(top_srcdir) != $(top_builddir) && rm $(builddir)/git_sha1.h ) 
>> || true
>
> I admit I have almost no experience with automake, but shouldn't make's 
> `-test`
> achieve the same result?
>
It should but I've deliberately opted out. Mostly because I'm not sure
how portable it is (gnu/netbsd/openbsd/etc make), but also because we
have zero cases of it in mesa.

> I also believe you forgot to CC: Andy :)
>
I believe that the ML hides the CC list in some odd cases. Here Andy
is definitely in the loop.

Thanks
Emil
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] automake: get in-tree `make distclean' working again.

2016-06-08 Thread Andy Furniss 

Emil Velikov wrote:

From: Emil Velikov 

With earlier commit we've handled the `make distclean' out of tree
build, yet we failed to attribute that for in-tree builds the test
condition will return 1. Thus effectively the target will be considered
as "failed".

Fixes: b7f7ec78435 ("mesa: automake: distclean git_sha1.h when building
OOT")
Cc: 
Cc: Andy Furniss 
Reported-by: Andy Furniss 
Signed-off-by: Emil Velikov 
---
Thanks for catching this Andy. The following seems to work fine here.
Can you give it a try on you end ?


Working OK for me with this, thanks.




Emil
---
  src/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 0527a31..32372da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,7 +50,7 @@ BUILT_SOURCES = git_sha1.h
  # At the same time `make distclean' gets angry at us if we don't cleanup the
  # builddir one.
  distclean-local:
-   test $(top_srcdir) != $(top_builddir) && rm $(builddir)/git_sha1.h
+   ( test $(top_srcdir) != $(top_builddir) && rm $(builddir)/git_sha1.h ) 
|| true

  SUBDIRS = . gtest util mapi/glapi/gen mapi



___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] automake: get in-tree `make distclean' working again.

2016-06-08 Thread Eric Engestrom 
On Wed, Jun 08, 2016 at 03:44:39PM +0100, Emil Velikov wrote:
> From: Emil Velikov 
> 
> With earlier commit we've handled the `make distclean' out of tree
> build, yet we failed to attribute that for in-tree builds the test
> condition will return 1. Thus effectively the target will be considered
> as "failed".
> 
> Fixes: b7f7ec78435 ("mesa: automake: distclean git_sha1.h when building
> OOT")
> Cc: 
> Cc: Andy Furniss 
> Reported-by: Andy Furniss 
> Signed-off-by: Emil Velikov 
> ---
> Thanks for catching this Andy. The following seems to work fine here.
> Can you give it a try on you end ?
> 
> Emil
> ---
>  src/Makefile.am | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 0527a31..32372da 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -50,7 +50,7 @@ BUILT_SOURCES = git_sha1.h
>  # At the same time `make distclean' gets angry at us if we don't cleanup the
>  # builddir one.
>  distclean-local:
> - test $(top_srcdir) != $(top_builddir) && rm $(builddir)/git_sha1.h
> + ( test $(top_srcdir) != $(top_builddir) && rm $(builddir)/git_sha1.h ) 
> || true

I admit I have almost no experience with automake, but shouldn't make's `-test`
achieve the same result?

I also believe you forgot to CC: Andy :)

>  
>  SUBDIRS = . gtest util mapi/glapi/gen mapi
>  
> -- 
> 2.8.2
> 
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] automake: get in-tree `make distclean' working again.

2016-06-08 Thread Emil Velikov 
From: Emil Velikov 

With earlier commit we've handled the `make distclean' out of tree
build, yet we failed to attribute that for in-tree builds the test
condition will return 1. Thus effectively the target will be considered
as "failed".

Fixes: b7f7ec78435 ("mesa: automake: distclean git_sha1.h when building
OOT")
Cc: 
Cc: Andy Furniss 
Reported-by: Andy Furniss 
Signed-off-by: Emil Velikov 
---
Thanks for catching this Andy. The following seems to work fine here.
Can you give it a try on you end ?

Emil
---
 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 0527a31..32372da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,7 +50,7 @@ BUILT_SOURCES = git_sha1.h
 # At the same time `make distclean' gets angry at us if we don't cleanup the
 # builddir one.
 distclean-local:
-   test $(top_srcdir) != $(top_builddir) && rm $(builddir)/git_sha1.h
+   ( test $(top_srcdir) != $(top_builddir) && rm $(builddir)/git_sha1.h ) 
|| true
 
 SUBDIRS = . gtest util mapi/glapi/gen mapi
 
-- 
2.8.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev