search for: have_ocaml

...iles changed, 26 insertions(+), 7 deletions(-) Index: libguestfs-1.20.1/Makefile.am =================================================================== --- libguestfs-1.20.1.orig/Makefile.am +++ libguestfs-1.20.1/Makefile.am @@ -74,7 +74,10 @@ if HAVE_PERL SUBDIRS += perl perl/examples endif if HAVE_OCAML -SUBDIRS += ocaml ocaml/examples +SUBDIRS += ocaml +endif +if HAVE_OCAMLOPT +SUBDIRS += ocaml/examples endif if HAVE_PYTHON SUBDIRS += python python/examples Index: libguestfs-1.20.1/configure.ac =================================================================== --- libguestfs-1.20.1.orig/confi...

...| 18 +++++++++++++- sysprep/Makefile.am | 18 +++++++++++++- 8 files changed, 143 insertions(+), 32 deletions(-) diff --git a/builder/Makefile.am b/builder/Makefile.am index f0cb1dd..bc7ab6e 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -68,7 +68,7 @@ noinst_DATA = if HAVE_OCAML # Note this list must be in dependency order. -OBJECTS = \ +deps = \ $(top_builddir)/mllib/libdir.cmx \ $(top_builddir)/mllib/common_gettext.cmx \ $(top_builddir)/mllib/common_utils.cmx \ @@ -109,6 +109,12 @@ OBJECTS = \ cmdline.cmx \ builder.cmx +if HAVE_OCAMLOPT +OBJECTS = $(deps)...

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#)

....ml SOURCES_C = \ - $(top_srcdir)/mllib/fsync-c.c \ - $(top_srcdir)/fish/progress.c \ - $(top_srcdir)/mllib/progress-c.c \ - $(top_srcdir)/fish/uri.c \ - $(top_srcdir)/mllib/uri-c.c + ../mllib/fsync-c.c \ + ../fish/progress.c \ + ../mllib/progress-c.c \ + ../fish/uri.c \ + ../mllib/uri-c.c if HAVE_OCAML diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am index 4e0b8c9..1112c17 100644 --- a/sparsify/Makefile.am +++ b/sparsify/Makefile.am @@ -35,8 +35,8 @@ SOURCES_ML = \ sparsify.ml SOURCES_C = \ - $(top_srcdir)/fish/progress.c \ - $(top_srcdir)/mllib/progress-c.c \ + ../fish/progress.c...

...+---- sysprep/Makefile.am | 40 ++++++++++++++++++++++++++++++++-- 8 files changed, 260 insertions(+), 25 deletions(-) diff --git a/builder/Makefile.am b/builder/Makefile.am index b8bf6ac..83ef46b 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -43,7 +43,30 @@ SOURCES = \ if HAVE_OCAML # Note this list must be in dependency order. -OBJECTS = \ +OBJECTS_bc = \ + $(top_builddir)/mllib/libdir.cmo \ + $(top_builddir)/mllib/common_gettext.cmo \ + $(top_builddir)/mllib/common_utils.cmo \ + $(top_builddir)/mllib/urandom.cmo \ + $(top_builddir)/mllib/random_seed.cmo \ + $(top_builddir...

...file.am b/ocaml/tests/Makefile.am index dfb23ff..56519c0 100644 --- a/ocaml/tests/Makefile.am +++ b/ocaml/tests/Makefile.am @@ -100,7 +100,10 @@ endif TESTS_ENVIRONMENT = LIBNBD_DEBUG=1 OCAMLRUNPARAM=b LOG_COMPILER = $(top_builddir)/run -TESTS = $(tests_bc) $(tests_opt) +TESTS = $(tests_bc) +if HAVE_OCAMLOPT +TESTS += $(tests_opt) +endif endif HAVE_NBDKIT endif HAVE_OCAML -- 2.21.0

...ested). Since we want to write parts of the daemon in OCaml, this makes OCaml required for all builds. Note that the ‘--disable-ocaml’ option remains, but it now only disables OCaml bindings and OCaml virt tools. Using this option does not disable the OCaml compiler requirement. Also note that ‘HAVE_OCAML’ changes meaning slightly, so it now means "build OCaml bindings and tools" (analogous to ‘HAVE_PERL’ and others). The generator, daemon [in a future commit], and some utility libraries needed by the generator or daemon do not test for this macro because we can assume OCaml compiler avai...

...will also need the fix to subdir-rules.mk. [1] https://www.redhat.com/archives/libguestfs/2019-December/msg00062.html Pino Toscano (7): Update common to latest build: stop shipping files generated by configure build: use the mlv2v library build: do not ship generated sources build: drop HAVE_OCAML conditionals build: actually require libvirt build: hopefully fix dependencies on generated files .gitignore | 2 -- common | 2 +- m4/guestfs-libraries.m4 | 22 ++------------------- ocaml-dep.sh.in | 1 + po/POTFILES-ml | 1 - test-har...

...build working for me, and copies from idioms in nbdkit/plugins/ocaml/Makefile.am. --- ocaml/Makefile.am | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index 0d876bb..557151c 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -32,6 +32,11 @@ if HAVE_OCAML OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)' OCAMLPACKAGES = -package unix +NBD.cmi: NBD.mli + $(OCAMLC) -c $< -o $@ + +NBD.cmo: NBD.cmi + noinst_DATA = mlnbd.cma META if HAVE_OCAMLOPT noinst_DATA += mlnbd.cmxa -- 2.20.1

...redhat.com> --- plugins/ocaml/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ocaml/Makefile.am b/plugins/ocaml/Makefile.am index b95f255..bbde5e1 100644 --- a/plugins/ocaml/Makefile.am +++ b/plugins/ocaml/Makefile.am @@ -39,7 +39,7 @@ EXTRA_DIST = \ if HAVE_OCAML -ocamllibdir = $(OCAMLLIB) +ocamllibdir = $(libdir)/ocaml ocamllib_DATA = NBDKit.mli NBDKit.cmi NBDKit.cmx NBDKit.o NBDKit.cmi: NBDKit.mli -- 2.17.2

...ile.am index 5046a8c..3f33118 100644 --- a/resize/Makefile.am +++ b/resize/Makefile.am @@ -17,6 +17,8 @@ include $(top_srcdir)/subdir-rules.mk +SOURCES = + EXTRA_DIST = \ $(SOURCES) \ virt-resize.pod \ @@ -27,7 +29,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img if HAVE_OCAML # Alphabetical order. -SOURCES = \ +SOURCES += \ progress_c.c \ progress.mli \ progress.ml \ @@ -120,10 +122,10 @@ depend: .depend include .depend -.PHONY: depend docs - endif +.PHONY: depend docs + # Parallel builds don't obey dependencies for some reason we # don't unde...

--- builder/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/Makefile.am b/builder/Makefile.am index a0d139b..29f7556 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -309,7 +309,7 @@ CLEANFILES += \ if HAVE_OCAML # Automake-generated makefile has a rule ".y.c" but lacks a rule ".y.h". index-parse.h: index-parse.y - touch index-parse.y + touch $(srcdir)/index-parse.y $(MAKE) index-parse.c # Also it doesn't generate dependencies for the C files that include # index-parse.h. -- 2...

From: Hilko Bengen <bengen at debian.org> On installations where no native OCaml compiler is available, the test program can't be compiled and so we get this message: ,---- | checking for function caml_raise_with_args... not found `---- This breaks building of the OCaml bindings. ,---- | gcc -std=gnu99 -I.. -I/usr/lib/ocaml -I../ocaml -I../lib -g -O2 -fPIC -Wall -c hivex_c.c |

...ilder/Makefile.am | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/builder/Makefile.am b/builder/Makefile.am index e3d37667b..3c7113eee 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -373,15 +373,7 @@ CLEANFILES += \ index-parse.h \ index-scan.c -if HAVE_OCAML -# Automake-generated makefile has a rule ".y.c" but lacks a rule ".y.h". -index-parse.h: index-parse.y - touch $(srcdir)/index-parse.y - $(MAKE) index-parse.c -# Also it doesn't generate dependencies for the C files that include -# index-parse.h. -index-parser-c.c index-sca...

...ts of the > daemon in OCaml, this makes OCaml required for all builds. > > Note that the ‘--disable-ocaml’ option remains, but it now only > disables OCaml bindings and OCaml virt tools. Using this option does > not disable the OCaml compiler requirement. > > Also note that ‘HAVE_OCAML’ changes meaning slightly, so it now means > "build OCaml bindings and tools" (analogous to ‘HAVE_PERL’ and > others). The generator, daemon [in a future commit], and some utility > libraries needed by the generator or daemon do not test for this macro > because we can assume...

...load_createvm_source.ml: $(srcdir)/rhv-upload-createvm.py + $(srcdir)/embed.sh code $^ $@ +output_rhv_upload_plugin_source.ml: $(srcdir)/rhv-upload-plugin.py + $(srcdir)/embed.sh code $^ $@ +output_rhv_upload_precheck_source.ml: $(srcdir)/rhv-upload-precheck.py + $(srcdir)/embed.sh code $^ $@ if HAVE_OCAML @@ -578,7 +578,7 @@ v2v_unit_tests_LINK = \ $(v2v_unit_tests_THEOBJECTS) -o $@ # Dependencies. -.depend: $(srcdir)/*.mli $(srcdir)/*.ml +.depend: $(srcdir)/*.mli $(srcdir)/*.ml output_rhv_upload_createvm_source.ml output_rhv_upload_plugin_source.ml output_rhv_upload_precheck_source.ml $(...

...curl.mli \ @@ -67,7 +69,9 @@ SOURCES_ML = \ JSON.ml \ curl.ml \ exit.ml \ - checksums.ml + checksums.ml \ + xml.ml \ + xpath_helpers.ml SOURCES_C = \ ../cat/visit.c \ @@ -85,7 +89,8 @@ SOURCES_C = \ progress-c.c \ statvfs-c.c \ uri-c.c \ - visit-c.c + visit-c.c \ + xml-c.c if HAVE_OCAML diff --git a/v2v/xml-c.c b/mllib/xml-c.c similarity index 100% rename from v2v/xml-c.c rename to mllib/xml-c.c diff --git a/v2v/xml.ml b/mllib/xml.ml similarity index 100% rename from v2v/xml.ml rename to mllib/xml.ml diff --git a/v2v/xml.mli b/mllib/xml.mli similarity index 100% rename from v2v/...

Simplifies the build a bit. This is on top of the previous SELinux relabelling patch set, although not related to it. Rich.

CentOS 6 has libguestfs-devel 1.20.11, which predates the support in guestfs_add_drive_opts() for requesting an nbd drive instead of a local file (annoyingly, guestfs documentation merely states the function was available since 0.3, without saying which later releases added new options); causing a compilation failure during 'make check'. Maybe the guestfs plugin should still be built,

...+++ b/sysprep/Makefile.am @@ -33,6 +33,7 @@ SOURCES = \ main.ml \ sysprep_operation.ml \ sysprep_operation.mli \ + sysprep_operation_bash_history.ml \ sysprep_operation_cron_spool.ml \ sysprep_operation_dhcp_client_state.ml \ sysprep_operation_dhcp_server_state.ml \ @@ -56,6 +57,7 @@ if HAVE_OCAML OBJECTS = \ utils.cmx \ sysprep_operation.cmx \ + sysprep_operation_bash_history.cmx \ sysprep_operation_cron_spool.cmx \ sysprep_operation_dhcp_client_state.cmx \ sysprep_operation_dhcp_server_state.cmx \ diff --git a/sysprep/sysprep_operation_bash_history.ml b/sysprep/sysprep_operation...