[libvirt] [PATCH v2] maint: Improve use of configmake.h on mingw

[Ján Tomko]

On Thu, Aug 08, 2019 at 09:17:19AM -0500, Eric Blake wrote:
>Gnulib has added a patch that allows configmake.h to be included
>without causing build failures on mingw if <winsock2.h> is later
>included (whether directly, or indirectly such as through gnulib's
><unistd.h>).
>
>This reverts commit fed58d83c60ff1c20292856bec006577788b7494 ("build:
>Fix checkpoint_conf on mingw"), now that we don't have to worry about
>header inclusion ordering issues.
>
>Signed-off-by: Eric Blake <eblake at redhat.com>
>---
>
>v1 was 'build: Solve mingw build clash with DATADIR', and dead on arrival,
>so it was reverted shortly after.
>
>It turns out that pragma push_macro isn't good enough (you have to
>do it before EVERY site that includes winsock2.h, including those that
>do so indirectly by including gnulib's replacement unistd.h), so it's
>better to just fix gnulib from the get-go instead of trying to work
>around it at every internal spot.
>
>This time, I've actually tested mingw locally rather than lazily
>relying on jenkins to do the mingw validation work for me; I used:
>
>make -f Makefile.ci ci-build at fedora-rawhide CI_CONFIGURE="mingw32-configure"
>
>But since I botched up v1, I'll still wait for a review before pushing
>v2.
>
>Gnulib changes:
>b5e7a0d configmake: Avoid namespace pollution issue on mingw.
>
> .gnulib                    | 2 +-
> src/conf/checkpoint_conf.c | 2 --
> 2 files changed, 1 insertion(+), 3 deletions(-)
>

Reviewed-by: Ján Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20190819/a1599ff2/attachment-0001.sig>