Libguestfs - Mar 2014 - [PATCH] supermin: Fix build with bytecode compiler

---
 src/Makefile.am | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 7f99b8a..932881b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,17 +104,18 @@ supermin_CFLAGS = \
 BOBJECTS = $(SOURCES_ML:.ml=.cmo)
 XOBJECTS = $(SOURCES_ML:.ml=.cmx)
 
+OCAMLPACKAGES = -package unix,str
+OCAMLFLAGS = -warn-error CDEFLMPSUVXYZ
+
 if !HAVE_OCAMLOPT
 OBJECTS = $(BOBJECTS)
 BEST    = c
+OCAMLFLAGS += -custom
 else
 OBJECTS = $(XOBJECTS)
 BEST    = opt
 endif
 
-OCAMLPACKAGES = -package unix,str
-OCAMLFLAGS = -warn-error CDEFLMPSUVXYZ
-
 supermin_DEPENDENCIES = $(OBJECTS) ext2init-bin.o
 
 supermin_LDADD = ext2init-bin.o ../lib/libgnu.a
-- 
1.9.0

On Mon, Mar 03, 2014 at 09:28:05AM +0100, Hilko Bengen
wrote:
> ---
>  src/Makefile.am | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 7f99b8a..932881b 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -104,17 +104,18 @@ supermin_CFLAGS = \
>  BOBJECTS = $(SOURCES_ML:.ml=.cmo)
>  XOBJECTS = $(SOURCES_ML:.ml=.cmx)
>  
> +OCAMLPACKAGES = -package unix,str
> +OCAMLFLAGS = -warn-error CDEFLMPSUVXYZ
> +
>  if !HAVE_OCAMLOPT
>  OBJECTS = $(BOBJECTS)
>  BEST    = c
> +OCAMLFLAGS += -custom
>  else
>  OBJECTS = $(XOBJECTS)
>  BEST    = opt
>  endif
>  
> -OCAMLPACKAGES = -package unix,str
> -OCAMLFLAGS = -warn-error CDEFLMPSUVXYZ
> -
>  supermin_DEPENDENCIES = $(OBJECTS) ext2init-bin.o
>  
>  supermin_LDADD = ext2init-bin.o ../lib/libgnu.a
> -- 
> 1.9.0
ACK.

Also: I found a nasty thinko in the code yesterday which has the
potential to cause random appliance corruption.  The fix is:

https://github.com/libguestfs/supermin/commit/1b53e2850e45a6e7bd6b4f75e865b59dcaf7971e

and I also released 5.1.2 last night which contains the fix:

http://libguestfs.org/download/supermin/

Rich.

-- 
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://people.redhat.com/~rjones/virt-top

* Richard W.M. Jones:
> Also: I found a nasty thinko in the code yesterday which has the
> potential to cause random appliance corruption.  The fix is:
>
>
https://github.com/libguestfs/supermin/commit/1b53e2850e45a6e7bd6b4f75e865b59dcaf7971e
>
> and I also released 5.1.2 last night which contains the fix:
I have already uploaded that to Debian/experimental. :-)

Cheers,
-Hilko