search for: ocamlfindflags

...9d409df89d72ca476ed829739b4aacf08735d Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering at redhat.com> Date: Fri, 2 Oct 2009 16:09:19 +0200 Subject: [PATCH libguestfs] build: fix compile error Link demo scripts with just-build library, not the installed one. * ocaml/examples/Makefile.am (OCAMLFINDFLAGS): New variable. (lvs, viewer): Use it. This fix is based on a suggestion from Rich Jones. This addresses <http://bugzilla.redhat.com/526917>. --- ocaml/examples/Makefile.am | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ocaml/examples/Makefile.am b/ocaml/exa...

...tests.* rm $(DESTDIR)$(OCAMLLIB)/guestfs/libguestfsocaml.a diff --git a/ocaml/examples/Makefile.am b/ocaml/examples/Makefile.am index 472e180..de647fc 100644 --- a/ocaml/examples/Makefile.am +++ b/ocaml/examples/Makefile.am @@ -58,16 +58,13 @@ inspect_vm: inspect_vm.ml $(OCAMLFIND) ocamlopt $(OCAMLFINDFLAGS) -package unix -linkpkg \ -warn-error A -I .. mlguestfs.cmxa $< -o $@ else - -# This avoids: -# Error: Error on dynamically loaded library: ../dllmlguestfs.so: libguestfs.so.0: cannot open shared object file: No such file or directory create_disk: create_disk.ml - $(top_builddir)/...

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

...make to not build goals in this +# directory in parallel. +.NOTPARALLEL: diff --git a/ocaml/examples/Makefile.am b/ocaml/examples/Makefile.am index 200a0aa..472e180 100644 --- a/ocaml/examples/Makefile.am +++ b/ocaml/examples/Makefile.am @@ -49,6 +49,7 @@ noinst_SCRIPTS = create_disk inspect_vm OCAMLFINDFLAGS = -cclib -L$(top_builddir)/src/.libs +if HAVE_OCAMLOPT create_disk: create_disk.ml $(OCAMLFIND) ocamlopt $(OCAMLFINDFLAGS) -package unix -linkpkg \ -warn-error A -I .. mlguestfs.cmxa $< -o $@ @@ -56,5 +57,17 @@ create_disk: create_disk.ml inspect_vm: inspect_vm.ml $(OCAMLFIND)...

...amples/Makefile.am @@ -47,14 +47,35 @@ if HAVE_OCAML noinst_SCRIPTS = create_disk inspect_vm +if HAVE_OCAMLOPT +FINAL_BINARY_create_disk = create_disk.opt +FINAL_BINARY_inspect_vm = inspect_vm.opt +else +FINAL_BINARY_create_disk = create_disk.bc +FINAL_BINARY_inspect_vm = inspect_vm.bc +endif OCAMLFINDFLAGS = -cclib -L$(top_builddir)/src/.libs -create_disk: create_disk.ml +create_disk.bc: create_disk.ml + $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ + $(OCAMLFIND) ocamlc $(OCAMLFINDFLAGS) -package unix -linkpkg \ + -custom \ + -warn-error A -I ....

This patch series moves some files and directories around but is only code motion (or supposed to be). A new directory, common/, is created for all of the common code which is currently shared in random ways between parts of the project. And src/ becomes lib/ (the largest change, but mostly mechanical). In full this series makes the following changes: src/libprotocol -> common/protocol

Previous patch series was posted here: https://www.redhat.com/archives/libguestfs/2017-January/msg00059.html v2 simply extends this patch series to cover the extra directories common/edit, common/progress, common/windows and common/parallel. The only remaining item is to consider whether we should rename mllib to something else, mlcommon was my suggestion. Rich.