Libguestfs - Mar 2010 - [PATCH 0/2] Another couple of OS X patches

With these I was able to build the library part of libguestfs.

In addition to the dependencies I listed before, you also need
PortableXDR.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming blog: http://rwmj.wordpress.com
Fedora now supports 80 OCaml packages (the OPEN alternative to F#)
http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora
-------------- next part --------------
>From 54e17baadbcb03ddb29a5cb7affeedd77ed0aea7 Mon Sep 17 00:00:00 2001
From: Richard Jones <rich at koneko.home.annexia.org>
Date: Sun, 21 Mar 2010 17:49:09 +0000
Subject: [PATCH 1/2] Mac OS X: include <string.h> in guestfs-actions.c

This is required because guestfs-actions.c uses 'memset'.
---
 src/generator.ml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/generator.ml b/src/generator.ml
index 92a7735..ba883ea 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -5393,6 +5393,7 @@ and generate_client_actions ()  #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <string.h>
 #include <inttypes.h>
 
 #include \"guestfs.h\"
-- 
1.6.4.1

-------------- next part --------------
>From bf4052337261bc7fefa8142e90d65dd0b97196af Mon Sep 17 00:00:00 2001
From: Richard Jones <rich at koneko.home.annexia.org>
Date: Sun, 21 Mar 2010 17:49:49 +0000
Subject: [PATCH 2/2] Mac OS X: include <rpc/types.h> before
<rpc/xdr.h>

In PortableXDR this is not included automatically so we
have to include it explicitly to get definitions for the
XDR types.
---
 src/guestfs.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/guestfs.h b/src/guestfs.h
index 5b8ad09..1a09fe8 100644
--- a/src/guestfs.h
+++ b/src/guestfs.h
@@ -62,6 +62,7 @@ extern void guestfs_set_subprocess_quit_callback (guestfs_h
*g, guestfs_subproce
 extern void guestfs_set_launch_done_callback (guestfs_h *g,
guestfs_launch_done_cb cb, void *opaque);
 
 /*--- Structures and actions ---*/
+#include <rpc/types.h>
 #include <rpc/xdr.h>
 #include <guestfs-structs.h>
 #include <guestfs-actions.h>
-- 
1.6.4.1

On Sun, Mar 21, 2010 at 05:52:50PM +0000, Richard W.M. Jones
wrote:
> 
> With these I was able to build the library part of libguestfs.
> 
> In addition to the dependencies I listed before, you also need
> PortableXDR.
The other thing was that I had to copy src/guestfs_protocol.[ch] from
a Fedora box.  Mac OS X's rpcgen does not know how to build XDR code
that contains 'hyper'.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine.  Supports Linux and Windows.
http://et.redhat.com/~rjones/virt-df/