[libvirt] [PATCH] build: avoid corrupted gnulib/tests/Makefile

2011-01-24 Thread Eric Blake 
Running 'make check' can sometimes fail in the gnulib/tests
subdirectory, when doing an incremental build, because
./bootstrap generates a Makefile.am that tries to refer to
../../.. instead of ../.., and gets lost.

This may be an upstream gnulib bug, where a more elegant
solution will present itself in the future:
http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/24898

But in the meantime, I was able to reproduce both the issue,
and this solution to work around it.

* bootstrap.conf (bootstrap_epilogue): Ensure that no stray
../../.. components remain in gnulib/tests/Makefile.in.
Reported by Serge Hallyn.
---
 bootstrap.conf |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index 88832d1..14d5ace 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -168,0 +168,0 @@ touch ChangeLog || exit 1

 bootstrap_epilogue()
 {
-  # Change paths in gnulib/tests/Makefile.am from "../../.." to "../..".
+  # Change paths in gnulib/tests/Makefile.am from "../../.." to "../..",
+  # then ensure that gnulib/tests/Makefile.in is up-to-date.
   m=gnulib/tests/Makefile.am
   sed 's,\.\./\.\./\.\.,../..,g' $m > $m-t
   mv -f $m-t $m
+  ${AUTOMAKE-automake} gnulib/tests/Makefile
 }
-- 
1.7.3.4

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] build: avoid corrupted gnulib/tests/Makefile

2011-01-24 Thread Daniel Veillard 
On Mon, Jan 24, 2011 at 05:29:46PM -0700, Eric Blake wrote:
> Running 'make check' can sometimes fail in the gnulib/tests
> subdirectory, when doing an incremental build, because
> ./bootstrap generates a Makefile.am that tries to refer to
> ../../.. instead of ../.., and gets lost.
> 
> This may be an upstream gnulib bug, where a more elegant
> solution will present itself in the future:
> http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/24898
> 
> But in the meantime, I was able to reproduce both the issue,
> and this solution to work around it.
> 
> * bootstrap.conf (bootstrap_epilogue): Ensure that no stray
> ../../.. components remain in gnulib/tests/Makefile.in.
> Reported by Serge Hallyn.
> ---
>  bootstrap.conf |4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/bootstrap.conf b/bootstrap.conf
> index 88832d1..14d5ace 100644
> --- a/bootstrap.conf
> +++ b/bootstrap.conf
> @@ -168,0 +168,0 @@ touch ChangeLog || exit 1
> 
>  bootstrap_epilogue()
>  {
> -  # Change paths in gnulib/tests/Makefile.am from "../../.." to "../..".
> +  # Change paths in gnulib/tests/Makefile.am from "../../.." to "../..",
> +  # then ensure that gnulib/tests/Makefile.in is up-to-date.
>m=gnulib/tests/Makefile.am
>sed 's,\.\./\.\./\.\.,../..,g' $m > $m-t
>mv -f $m-t $m
> +  ${AUTOMAKE-automake} gnulib/tests/Makefile
>  }

  ACK,

Daniel

-- 
Daniel Veillard  | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
dan...@veillard.com  | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library  http://libvirt.org/

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] build: avoid corrupted gnulib/tests/Makefile

2011-01-25 Thread Eric Blake 
On 01/24/2011 08:27 PM, Daniel Veillard wrote:
>> This may be an upstream gnulib bug, where a more elegant
>> solution will present itself in the future:
>> http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/24898
>>
>> But in the meantime, I was able to reproduce both the issue,
>> and this solution to work around it.
>>
>> * bootstrap.conf (bootstrap_epilogue): Ensure that no stray
>> ../../.. components remain in gnulib/tests/Makefile.in.
>> Reported by Serge Hallyn.

>   ACK,

Thanks; pushed.

-- 
Eric Blake   ebl...@redhat.com+1-801-349-2682
Libvirt virtualization library http://libvirt.org



signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] build: avoid corrupted gnulib/tests/Makefile

2011-01-25 Thread Serge E. Hallyn 
Quoting Eric Blake (ebl...@redhat.com):
> On 01/24/2011 08:27 PM, Daniel Veillard wrote:
> >> This may be an upstream gnulib bug, where a more elegant
> >> solution will present itself in the future:
> >> http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/24898
> >>
> >> But in the meantime, I was able to reproduce both the issue,
> >> and this solution to work around it.
> >>
> >> * bootstrap.conf (bootstrap_epilogue): Ensure that no stray
> >> ../../.. components remain in gnulib/tests/Makefile.in.
> >> Reported by Serge Hallyn.
> 
> >   ACK,
> 
> Thanks; pushed.

Thanks, guys.

-serge

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list