Libguestfs - Mar 2010 - [PATCH 0/3] Three final patches which fix build issues on Mac OS X

With these I'm able to get all the way to the end of the build
on OS X 10.5.

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/

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
libguestfs lets you edit virtual machines.  Supports shell scripting,
bindings from many languages.  http://et.redhat.com/~rjones/libguestfs/
See what it can do: http://et.redhat.com/~rjones/libguestfs/recipes.html
-------------- next part --------------
>From 2a41583130dc8ded7d626c5ee5e7e2de9d1dd3d2 Mon Sep 17 00:00:00 2001
From: Richard Jones <rich at koneko.home.annexia.org>
Date: Mon, 22 Mar 2010 10:05:49 +0000
Subject: [PATCH 1/3] ocaml examples: Fix linking line so it uses local library.

---
 ocaml/examples/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ocaml/examples/Makefile.am b/ocaml/examples/Makefile.am
index ab058b1..e38a5c8 100644
--- a/ocaml/examples/Makefile.am
+++ b/ocaml/examples/Makefile.am
@@ -10,7 +10,7 @@ if HAVE_OCAML
 
 noinst_SCRIPTS = lvs
 
-OCAMLFINDFLAGS = -ccopt '-L $(top_builddir)/src/.libs'
+OCAMLFINDFLAGS = -cclib -L$(top_builddir)/src/.libs
 
 lvs:	lvs.ml
 	$(OCAMLFIND) ocamlopt $(OCAMLFINDFLAGS) \
-- 
1.6.4.1

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
libguestfs lets you edit virtual machines.  Supports shell scripting,
bindings from many languages.  http://et.redhat.com/~rjones/libguestfs/
See what it can do: http://et.redhat.com/~rjones/libguestfs/recipes.html
-------------- next part --------------
>From aaa163b8b635633adf23875df99fc94de4aba02f Mon Sep 17 00:00:00 2001
From: Richard Jones <rich at koneko.home.annexia.org>
Date: Mon, 22 Mar 2010 10:29:18 +0000
Subject: [PATCH 2/3] guestfs.h: Include <stdint.h>.

This allows programs to work if they just
  #include <guestfs.h>
and no other headers.  It's not useful in the general
case, but fixes some configure-time tests, particularly
the one for Ruby on OS X.
---
 src/guestfs.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/guestfs.h b/src/guestfs.h
index 1a09fe8..b43cd8b 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 <stdint.h>
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 #include <guestfs-structs.h>
-- 
1.6.4.1

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://et.redhat.com/~rjones/virt-top
-------------- next part --------------
>From fd249d0c0caf6ef5f2671df2226e2feaf726ecb5 Mon Sep 17 00:00:00 2001
From: Richard Jones <rich at koneko.home.annexia.org>
Date: Mon, 22 Mar 2010 10:30:25 +0000
Subject: [PATCH 3/3] Mac OS X: Fix configure-time tests for Ruby.

For ARCHFLAGS change, see:
http://www.ruby-forum.com/topic/129717#579065

We also add a test for the <guestfs.h> header and include
that header when testing the library.
---
 .gitignore                  |    1 +
 ruby/Rakefile.in            |    2 +-
 ruby/ext/guestfs/extconf.rb |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2d7f383..5914499 100644
--- a/.gitignore
+++ b/.gitignore
@@ -202,6 +202,7 @@ regressions/test.err
 regressions/test.out
 ruby/bindtests.rb
 ruby/ext/guestfs/extconf.h
+ruby/ext/guestfs/_guestfs.bundle
 ruby/ext/guestfs/_guestfs.c
 ruby/ext/guestfs/_guestfs.so
 ruby/ext/guestfs/mkmf.log
diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in
index a000255..e77b0eb 100644
--- a/ruby/Rakefile.in
+++ b/ruby/Rakefile.in
@@ -38,7 +38,7 @@ CLOBBER.include [ "@builddir@/config.save",
"@builddir@/ext/**/mkmf.log",
 # Build locally
 
 file MAKEFILE => EXT_CONF do |t|
-     unless sh "top_srcdir=$(pwd)/@top_srcdir@;
top_builddir=$(pwd)/@top_builddir@; cd #{File::dirname(EXT_CONF)}; ruby
#{File::basename(EXT_CONF)} --with-_guestfs-include=$top_srcdir/src
--with-_guestfs-lib=$top_builddir/src/.libs"
+     unless sh "top_srcdir=$(pwd)/@top_srcdir@;
top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname
-m)\"; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)}
--with-_guestfs-include=$top_srcdir/src
--with-_guestfs-lib=$top_builddir/src/.libs"
          $stderr.puts "Failed to run extconf"
          break
      end
diff --git a/ruby/ext/guestfs/extconf.rb b/ruby/ext/guestfs/extconf.rb
index 67389fd..3413e04 100644
--- a/ruby/ext/guestfs/extconf.rb
+++ b/ruby/ext/guestfs/extconf.rb
@@ -22,7 +22,10 @@ extension_name = '_guestfs'
 
 dir_config(extension_name)
 
-unless have_library("guestfs", "guestfs_create")
+unless have_header ("guestfs.h")
+  raise "<guestfs.h> not found"
+end
+unless have_library("guestfs", "guestfs_create",
"guestfs.h")
   raise "libguestfs not found"
 end
 
-- 
1.6.4.1