Hilko Bengen
2011-May-09 07:08 UTC
[Libguestfs] [PATCH] Don't rely on OCaml native compiler for tests
This should make it possible to build useful OCaml bindings on architectures other than i386 and amd64 (Debian bug #589809). --- ocaml/Makefile.am | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index b3f5e14..b9451e3 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -46,7 +46,7 @@ hivex_c.o: hivex_c.c $(CC) $(AM_CPPFLAGS) $(CFLAGS) -fPIC -Wall -c $< TESTS_ENVIRONMENT = \ - LD_LIBRARY_PATH=$(top_builddir)/lib/.libs \ + LD_LIBRARY_PATH=$(top_builddir)/lib/.libs:$(top_builddir)/ocaml \ $(VG) TESTS = \ @@ -59,33 +59,33 @@ TESTS = \ t/hivex_300_fold noinst_DATA += $(TESTS) -t/hivex_005_load: t/hivex_005_load.cmx mlhivex.cmxa +t/hivex_005_load: t/hivex_005_load.cmo mlhivex.cma mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ + $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ -t/hivex_010_open: t/hivex_010_open.cmx mlhivex.cmxa +t/hivex_010_open: t/hivex_010_open.cmo mlhivex.cma mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ + $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ -t/hivex_020_root: t/hivex_020_root.cmx mlhivex.cmxa +t/hivex_020_root: t/hivex_020_root.cmo mlhivex.cma mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ + $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ -t/hivex_100_errors: t/hivex_100_errors.cmx mlhivex.cmxa +t/hivex_100_errors: t/hivex_100_errors.cmo mlhivex.cma mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ + $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ -t/hivex_110_gc_handle: t/hivex_110_gc_handle.cmx mlhivex.cmxa +t/hivex_110_gc_handle: t/hivex_110_gc_handle.cmo mlhivex.cma mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ + $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ -t/hivex_200_write: t/hivex_200_write.cmx mlhivex.cmxa +t/hivex_200_write: t/hivex_200_write.cmo mlhivex.cma mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ + $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ -t/hivex_300_fold: t/hivex_300_fold.cmx mlhivex.cmxa +t/hivex_300_fold: t/hivex_300_fold.cmo mlhivex.cma mkdir -p t - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ + $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ # Need to rebuild the tests from source if the main library has # changed at all, otherwise we get inconsistent assumptions. -- 1.7.4.4
Richard W.M. Jones
2011-May-09 07:37 UTC
[Libguestfs] [PATCH] Don't rely on OCaml native compiler for tests
On Mon, May 09, 2011 at 09:08:17AM +0200, Hilko Bengen wrote:> This should make it possible to build useful OCaml bindings on > architectures other than i386 and amd64 (Debian bug #589809). > --- > ocaml/Makefile.am | 30 +++++++++++++++--------------- > 1 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am > index b3f5e14..b9451e3 100644 > --- a/ocaml/Makefile.am > +++ b/ocaml/Makefile.am > @@ -46,7 +46,7 @@ hivex_c.o: hivex_c.c > $(CC) $(AM_CPPFLAGS) $(CFLAGS) -fPIC -Wall -c $< > > TESTS_ENVIRONMENT = \ > - LD_LIBRARY_PATH=$(top_builddir)/lib/.libs \ > + LD_LIBRARY_PATH=$(top_builddir)/lib/.libs:$(top_builddir)/ocaml \ > $(VG) > > TESTS = \ > @@ -59,33 +59,33 @@ TESTS = \ > t/hivex_300_fold > noinst_DATA += $(TESTS) > > -t/hivex_005_load: t/hivex_005_load.cmx mlhivex.cmxa > +t/hivex_005_load: t/hivex_005_load.cmo mlhivex.cma > mkdir -p t > - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ > + $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ > > -t/hivex_010_open: t/hivex_010_open.cmx mlhivex.cmxa > +t/hivex_010_open: t/hivex_010_open.cmo mlhivex.cma > mkdir -p t > - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ > + $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ > > -t/hivex_020_root: t/hivex_020_root.cmx mlhivex.cmxa > +t/hivex_020_root: t/hivex_020_root.cmo mlhivex.cma > mkdir -p t > - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ > + $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ > > -t/hivex_100_errors: t/hivex_100_errors.cmx mlhivex.cmxa > +t/hivex_100_errors: t/hivex_100_errors.cmo mlhivex.cma > mkdir -p t > - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ > + $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ > > -t/hivex_110_gc_handle: t/hivex_110_gc_handle.cmx mlhivex.cmxa > +t/hivex_110_gc_handle: t/hivex_110_gc_handle.cmo mlhivex.cma > mkdir -p t > - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ > + $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ > > -t/hivex_200_write: t/hivex_200_write.cmx mlhivex.cmxa > +t/hivex_200_write: t/hivex_200_write.cmo mlhivex.cma > mkdir -p t > - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ > + $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ > > -t/hivex_300_fold: t/hivex_300_fold.cmx mlhivex.cmxa > +t/hivex_300_fold: t/hivex_300_fold.cmo mlhivex.cma > mkdir -p t > - $(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cmxa $< -o $@ > + $(OCAMLFIND) ocamlc -cclib -L$(top_builddir)/lib/.libs -I . -package unix -linkpkg mlhivex.cma $< -o $@ > > # Need to rebuild the tests from source if the main library has > # changed at all, otherwise we get inconsistent assumptions. > -- > 1.7.4.4ACK -- I'll push this later today. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v
Apparently Analagous Threads
- [hivex] [PATCH 4/8] ocaml: Add unit test for new RLenValue type
- [hivex][PATCH 4/8] ocaml: Add unit test for new RLenValue type
- hivex: Test failure for Perl, OCaml, Python bindings on sparc
- [PATCH] hivex: A few tweaks to enable building in a separate directory
- [PATCH hivex] ocaml: Link the C bindings with LDFLAGS (RHBZ#1548536).