[libvirt] [PATCH] build: work around gcc 6.0 warnings

[Michal Privoznik]

On 24.02.2016 22:29, Eric Blake wrote:
> gcc 6.0 added an annoying warning:
> 
> fdstream.c: In function 'virFDStreamWrite':
> fdstream.c:390:29: error: logical 'or' of equal expressions [-Werror=logical-op]
>         if (errno == EAGAIN || errno == EWOULDBLOCK) {
>                             ^~
> fdstream.c: In function 'virFDStreamRead':
> fdstream.c:440:29: error: logical 'or' of equal expressions [-Werror=logical-op]
>         if (errno == EAGAIN || errno == EWOULDBLOCK) {
>                             ^~
> 
> This makes it impossible to build out-of-the-box on rawhide,
> and we aren't guaranteed that the gcc bug will be fixed in a
> timely manner:
> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602
> 
> So work around it by further complicating the logic to thwart the
> compiler.
> 
> Signed-off-by: Eric Blake <eblake at redhat.com>
> ---
> 
> This is a build-breaker fix for rawhide; but I'll wait for a day
> for any reasons why I should not push it during freeze.
> 
>  src/fdstream.c                  |  8 +++++---
>  src/rpc/virnetsshsession.c      | 10 +++++++---
>  src/security/security_selinux.c |  5 +++--
>  3 files changed, 15 insertions(+), 8 deletions(-)
> 

I'm having some difficulties applying this:


Applying: build: work around gcc 6.0 warnings
Using index info to reconstruct a base tree...
error: patch failed: src/fdstream.c:1
error: src/fdstream.c: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001 build: work around gcc 6.0 warnings

Could it be that my git is 'only' 2.4.10 while yours is 2.5.0?

Michal