[libvirt] [PATCHv3 7/7] build: make building on cygwin easier

[Eric Blake]

On 12/18/2010 02:52 PM, Matthias Bolte wrote:
> 2010/12/18 Eric Blake <eblake at redhat.com>:
>> * configure.ac (dlopen): Cygwin dlopen is in libc; avoid spurious
>> failure.
>> (XDR_CFLAGS): Define when needed.
>> * src/Makefile.am (libvirt_driver_remote_la_CFLAGS): Use it.
>> ---
>>
> 
> This incremental patch fixes it, by including the current CFLAGS
> instead of overriding them.
> 
> 
> diff --git a/configure.ac b/configure.ac
> index 27239f6..93532a6 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -343,12 +343,13 @@ if test x"$with_remote" = x"yes" || test
> x"$with_libvirtd" = x"yes"; then
>      dnl Cygwin requires -I/usr/include/tirpc for <rpc/rpc.h>
>      old_CFLAGS=$CFLAGS
>      AC_CACHE_CHECK([where to find <rpc/rpc.h>], [lv_cv_xdr_cflags], [
> -      for CFLAGS in '' '-I/usr/include/tirpc' 'missing'; do
> -        if test x"$CFLAGS" = xmissing; then
> +      for add_CFLAGS in '' '-I/usr/include/tirpc' 'missing'; do
> +        if test x"$add_CFLAGS" = xmissing; then
>            lv_cv_xdr_cflags=missing; break
>          fi
> +        CFLAGS="$old_CFLAGS $add_CFLAGS"
>          AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <rpc/rpc.h>
> -        ]])], [lv_cv_xdr_cflags=${CFLAGS:-none}; break])
> +        ]])], [lv_cv_xdr_cflags=${add_CFLAGS:-none}; break])

ACK to your additions, and coupled with your ACK of the rest of my
patch, this passed testing on Fedora 14, RHEL 5, a Linux-hosted
cross-build to mingw, and a native cygwin build, so I've gone ahead and
pushed it.

However, in the meantime, I've already mentioned to you on IRC that
--with-vmware --without-esx creates a broken build right now, which can
easily be the case when you don't have curl-devel headers installed (esx
won't build without curl, but vmware will).  ./autobuild.sh fails as a
result of that, because 'make rpm' doesn't yet know to build
--without-vmware by default.  I'll let you work on the patch for
dependencies between vmware and esx, while I work on cleaning up the
.spec file for 'make rpm'.

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

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 619 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20101220/26068f7c/attachment-0001.sig>