[Pkg-libvirt-commits] [libguestfs] 55/78: sparsify: Fix automake build.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch experimental
in repository libguestfs.

commit 8f3959e581fdbebce95637408f8f44388abc60f4
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Apr 14 11:42:33 2014 +0100

    sparsify: Fix automake build.
    
    Previous commit 97c57a8887e04742c58c3956385a5366c6df02c3 added a
    potential bug in the sparsify build.  If virt-sparsify had used a
    *.mli file then it would have tried to run a command like:
    
     ocamlc mlguestfs.cmxa -c foo.mli -o foo.cmi
    
    This would fail because ocamlc doesn't know about native code
    libraries (*.cmxa).  In fact virt-sparsify was not affected by this
    because it doesn't use any *.mli files.
    
    Fix this by adjusting the automake variables.
---
 sparsify/Makefile.am | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
index b595150..7733dab 100644
--- a/sparsify/Makefile.am
+++ b/sparsify/Makefile.am
@@ -75,12 +75,11 @@ OCAMLFLAGS = -g -warn-error CDEFLMPSUVYZX
 if !HAVE_OCAMLOPT
 OBJECTS = $(BOBJECTS)
 BEST    = c
-OCAMLLINKFLAGS = -custom
-OCAMLPACKAGES += mlguestfs.cma
+OCAMLLINKFLAGS = mlguestfs.cma -custom
 else
 OBJECTS = $(XOBJECTS)
 BEST    = opt
-OCAMLPACKAGES += mlguestfs.cmxa
+OCAMLLINKFLAGS = mlguestfs.cmxa
 endif
 
 virt_sparsify_DEPENDENCIES = $(OBJECTS)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git