search for: cdeflmpsuvyzx

...ed, 15 insertions(+), 9 deletions(-) diff --git a/builder/Makefile.am b/builder/Makefile.am index dd96533..fd5c8e2 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -158,7 +158,7 @@ if HAVE_OCAML_PKG_GETTEXT OCAMLPACKAGES += -package gettext-stub endif -OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX-3 $(OCAMLPACKAGES) +OCAMLCFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) $(OCAMLPACKAGES) OCAMLOPTFLAGS = $(OCAMLCFLAGS) OCAMLCLIBS = \ diff --git a/configure.ac b/configure.ac index d464615..20f87ca 100644 --- a/configure.ac +++ b/configure.ac @@ -1093,6 +1093,12 @@ AC_CHECK_PROG([OCAML_GETTEXT],...

Just like with index-parse.h, also index-struct.h is a dependency of index-parser-c.c which automake cannot generate correctly. Thus, add it manually. --- builder/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/Makefile.am b/builder/Makefile.am index fc4c552..6565abb 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -231,7 +231,7 @@ CLEANFILES

...in several directories: ., ../mllib findlib: [WARNING] Interface perl_edit.cmi occurs in several directories: ., ../mllib findlib: [WARNING] Interface perl_edit.cmi occurs in several directories: ., ../mllib CC virt_index_validate-index-scan.o ocamlfind ocamlc -g -warn-error CDEFLMPSUVYZX -package str,unix -I ../src/.libs -I ../ocaml -I ../mllib -package gettext-stub -c list_entries.mli -o list_entries.cmi CC index-scan.o findlib: [WARNING] Interface perl_edit.cmi occurs in several directories: ., ../mllib ocamlfind ocamlopt -g -warn-error CDEFLMPSUVYZX -package...

...orig/ocaml/Makefile.am +++ libguestfs-1.20.1/ocaml/Makefile.am @@ -43,10 +43,20 @@ CLEANFILES += t/*.cmi t/*.cmo t/*.cmx t/ if HAVE_OCAML +DATA_HOOK_FILES = META *.so *.a *.cma \ + *.cmi $(srcdir)/*.mli +if HAVE_OCAMLOPT +DATA_HOOK_FILES += *.cmx *.cmxa +endif + OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX OCAMLOPTFLAGS = $(OCAMLCFLAGS) -noinst_DATA = mlguestfs.cma mlguestfs.cmxa META +noinst_DATA = mlguestfs.cma +if HAVE_OCAMLOPT +noinst_DATA += mlguestfs.cmxa +endif +noinst_DATA += META # Build the C part into a library, so that automake handles the C # compilation step for us. Note that we...

Once ocamlfind is installed, 'make' failed for me with: ocamlfind ocamlc -g -annot -safe-string -warn-error CDEFLMPSUVYZX+52-3 -ccopt '-gdwarf' -package unix -c NBD.ml -o NBD.cmo File "NBD.ml", line 1: Error: Could not find the .cmi file for interface NBD.mli. make[2]: *** [Makefile:823: NBD.cmo] Error 2 I'm not positive that this is the perfect fix, but it at least got the build working for me,...

....11 --foreign generator/Makefile cd .. && /bin/sh ./config.status generator/Makefile config.status: creating generator/Makefile make[2]: Leaving directory `/home/rjones/d/libguestfs/generator' make[2]: Entering directory `/home/rjones/d/libguestfs/generator' ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_docstrings.ml -o generator_docstrings.cmo ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_c.ml -o generator_c.cmo ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_xdr.ml -o generator_xdr.cmo ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_daemon.ml -o generator_daemon.cmo ocamlc.o...

...-1.11 --foreign generator/Makefile cd .. && /bin/bash ./config.status generator/Makefile config.status: creating generator/Makefile make[2]: Leaving directory `/home/rjones/d/libguestfs/generator' make[2]: Entering directory `/home/rjones/d/libguestfs/generator' ocamlc -warn-error CDEFLMPSUVYZX -c generator_actions.ml -o generator_actions.cmo ocamlc -warn-error CDEFLMPSUVYZX -c generator_docstrings.ml -o generator_docstrings.cmo ocamlc -warn-error CDEFLMPSUVYZX -c generator_c.ml -o generator_c.cmo ocamlc -warn-error CDEFLMPSUVYZX -c generator_xdr.ml -o generator_xdr.cmo ocamlc -warn-error...

...rt-builder # installed copy of libguestfs. OCAMLPACKAGES = \ -package str,unix \ - -I $(top_builddir)/src/.libs \ -I $(top_builddir)/ocaml \ -I $(top_builddir)/mllib if HAVE_OCAML_PKG_GETTEXT @@ -81,15 +109,29 @@ OCAMLPACKAGES += -package gettext-stub endif OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES) -OCAMLOPTFLAGS = $(OCAMLCFLAGS) +OCAMLOPTFLAGS = \ + -I $(top_builddir)/src/.libs \ + $(OCAMLCFLAGS) -virt-builder: $(OBJECTS) +virt-builder.bc: $(OBJECTS_bc) + $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ + $(OCAMLFIND) ocamlc $(OCAMLC...

Building 1.9.53 fails for me with ocaml 3.10.2 and 3.12.1, likely due to commit a0722c7ad846960be54978a31ebe73b76e119203: [ 318s] ocamlfind ocamlopt -g -warn-error CDEFLMPSUVYZX -package str -I ../src/.libs -I ../ocaml \ [ 318s] mlguestfs.cmxa -linkpkg ../fish/guestfish-progress.o progress-c.o resize_gettext.cmx resize_utils.cmx progress.cmx resize.cmx -cclib -lncurses -o virt-resize [ 318s] No implementations provided for the following modules: [ 318s] Unix...

...rtname[0] != '/') { error (g, _("rbd: image name must begin with a '/'")); return NULL; } I tried to comment this out and recompile guestfs, but I get an error: make[2]: Entering directory `/root/libguestfs-1.25.6/builder' ocamlfind ocamlopt -g -warn-error CDEFLMPSUVYZX -package str,unix -I ../src/.libs -I ../ocaml -I ../mllib -package gettext-stub -c builder.ml -o builder.cmx File "builder.ml", line 53, characters 4-14: Error: Unbound value List.iteri make[2]: *** [builder.cmx] Error 2 make[2]: Leaving directory `/root/libguestfs-1.25.6/builder' mak...

....11 --foreign generator/Makefile cd .. && /bin/sh ./config.status generator/Makefile config.status: creating generator/Makefile make[2]: Leaving directory `/home/rjones/d/libguestfs/generator' make[2]: Entering directory `/home/rjones/d/libguestfs/generator' ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_actions.ml -o generator_actions.cmo ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_c.ml -o generator_c.cmo ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_daemon.ml -o generator_daemon.cmo ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_capitests.ml -o generator_capitests.cmo oc...

...mlguestfs.cma -linkpkg $^ -cclib -lncurses -o $@ +endif TESTS_ENVIRONMENT = $(top_builddir)/run --test diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index 5dd2c9b..708b2e7 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -40,7 +40,10 @@ if HAVE_OCAML OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX OCAMLOPTFLAGS = $(OCAMLCFLAGS) -noinst_DATA = mlguestfs.cma mlguestfs.cmxa META +noinst_DATA = mlguestfs.cma META +if HAVE_OCAMLOPT +noinst_DATA += mlguestfs.cmxa +endif # Build the C part into a library, so that automake handles the C # compilation step for us. Note that we don't dire...

....11 --foreign generator/Makefile cd .. && /bin/sh ./config.status generator/Makefile config.status: creating generator/Makefile make[2]: Leaving directory `/home/rjones/d/libguestfs/generator' make[2]: Entering directory `/home/rjones/d/libguestfs/generator' ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_actions.ml -o generator_actions.cmo ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_c.ml -o generator_c.cmo ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_daemon.ml -o generator_daemon.cmo ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_fish.ml -o generator_fish.cmo ocamlc.opt -...

....11 --foreign generator/Makefile cd .. && /bin/sh ./config.status generator/Makefile config.status: creating generator/Makefile make[2]: Leaving directory `/home/rjones/d/libguestfs/generator' make[2]: Entering directory `/home/rjones/d/libguestfs/generator' ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_c.ml -o generator_c.cmo ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_daemon.ml -o generator_daemon.cmo ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_fish.ml -o generator_fish.cmo ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_ocaml.ml -o generator_ocaml.cmo ocamlc.opt -warn...

....11 --foreign generator/Makefile cd .. && /bin/sh ./config.status generator/Makefile config.status: creating generator/Makefile make[2]: Leaving directory `/home/rjones/d/libguestfs/generator' make[2]: Entering directory `/home/rjones/d/libguestfs/generator' ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_java.ml -o generator_java.cmo ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_main.ml -o generator_main.cmo ocamlc.opt -o generator -warn-error CDEFLMPSUVYZX unix.cma str.cma generator_types.cmo generator_utils.cmo generator_actions.cmo generator_structs.cmo generator_api_versions.cm...

I believe this patch has now been superseded by Hilko's commit here: https://github.com/libguestfs/libguestfs/commit/f75142c577255b30f2a8e1d27baa5fd185594197 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#)

...-1.11 --foreign generator/Makefile cd .. && /bin/bash ./config.status generator/Makefile config.status: creating generator/Makefile make[2]: Leaving directory `/home/rjones/d/libguestfs/generator' make[2]: Entering directory `/home/rjones/d/libguestfs/generator' ocamlc -warn-error CDEFLMPSUVYZX -c generator_types.ml -o generator_types.cmo ocamlc -warn-error CDEFLMPSUVYZX -c generator_utils.mli -o generator_utils.cmi ocamlc -warn-error CDEFLMPSUVYZX -c generator_utils.ml -o generator_utils.cmo ocamlc -warn-error CDEFLMPSUVYZX -c generator_actions.mli -o generator_actions.cmi ocamlc -warn-e...

....11 --foreign generator/Makefile cd .. && /bin/sh ./config.status generator/Makefile config.status: creating generator/Makefile make[2]: Leaving directory `/home/rjones/d/libguestfs/generator' make[2]: Entering directory `/home/rjones/d/libguestfs/generator' ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_ruby.ml -o generator_ruby.cmo ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_main.ml -o generator_main.cmo ocamlc.opt -o generator -warn-error CDEFLMPSUVYZX unix.cma str.cma generator_types.cmo generator_utils.cmo generator_actions.cmo generator_structs.cmo generator_api_versions.cm...

....11 --foreign generator/Makefile cd .. && /bin/sh ./config.status generator/Makefile config.status: creating generator/Makefile make[2]: Leaving directory `/home/rjones/d/libguestfs/generator' make[2]: Entering directory `/home/rjones/d/libguestfs/generator' ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_actions.ml -o generator_actions.cmo ocamlc.opt -o generator -warn-error CDEFLMPSUVYZX unix.cma str.cma generator_types.cmo generator_utils.cmo generator_actions.cmo generator_structs.cmo generator_api_versions.cmo generator_optgroups.cmo generator_prepopts.cmo generator_events.cmo gene...

...48 Path table size(bytes): 26 Max brk space used 0 635 extents written (1 MB) rmdir directory mv test.iso-t test.iso make[2]: Leaving directory `/home/rjones/d/libguestfs/images' Making all in generator make[2]: Entering directory `/home/rjones/d/libguestfs/generator' ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_types.ml -o generator_types.cmo ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_utils.mli -o generator_utils.cmi ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_utils.ml -o generator_utils.cmo ocamlc.opt -warn-error CDEFLMPSUVYZX -c generator_actions.mli -o generator_actions.cmi oc...