search for: ocamloptflag

....la --mode=execute \ + $(guestfs_am_v_ocamlc)$(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ if HAVE_OCAMLOPT %.opt: %.cmx mlguestfs.cmxa - $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@ + $(guestfs_am_v_ocamlopt)$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@ endif check-valgrind: @@ -173,16 +173,16 @@ CLEA...

* Richard W.M. Jones: > Yes, also this commit doesn't actually fix the problem. I still see > occasional problems building StringMap. I have reverted this commit. Here's another patch that should enable the native-code targets only if they can be built. Cheers, -Hilko

...100644 --- a/plugins/ocaml/Makefile.am +++ b/plugins/ocaml/Makefile.am @@ -43,10 +43,10 @@ ocamllibdir = $(OCAMLLIB) ocamllib_DATA = NBDKit.mli NBDKit.cmi NBDKit.cmx NBDKit.o NBDKit.cmi: NBDKit.mli - $(OCAMLC) -c $< + $(OCAMLC) -c $< -o $@ NBDKit.cmx: NBDKit.ml NBDKit.cmi - $(OCAMLOPT) $(OCAMLOPTFLAGS) -c $< + $(OCAMLOPT) $(OCAMLOPTFLAGS) -c $< -o $@ NBDKit.o: NBDKit.cmx # NB: libnbdkitocaml is not plugin. It's a library that you have to diff --git a/tests/Makefile.am b/tests/Makefile.am index 4e16fa9..94f3d43 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -517,7 +517,9...

...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 $(OCAMLCFLAGS) \ + -custom \ + mlgu...

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

...96533..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],[ocaml-gettext],[ocaml-gettext],[no]) AM_CONDITIONAL([HAVE_OCAML_GETTEXT], [test "x$OCAML...

...file.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 don't dir...

At the moment OpenStack uses kpartx and nbd to resize filesystems and inject files to guests. I sincerely hope they don't allow untrusted users to upload guest images / AMIs :-( To fix this I'm looking into adding libguestfs support as an optional backend in OpenStack. The only missing feature in libguestfs is the ability to call tune2fs on a filesystem. This patch series adds tune2fs

...S = $(patsubst %.cmx,%.cmo,$(deps)) +endif + bin_SCRIPTS = virt-builder # -I $(top_builddir)/src/.libs is a hack which forces corresponding -L @@ -134,12 +140,22 @@ OCAMLCLIBS = \ -pthread -lpthread \ -lncurses -lcrypt +if HAVE_OCAMLOPT virt-builder: $(OBJECTS) $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \ mlguestfs.cmxa -linkpkg $^ \ -cclib '$(OCAMLCLIBS)' \ $(OCAML_GCOV_LDFLAGS) \ -o $@ +else +virt-builder: $(OBJECTS) + $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) \ + mlguestfs.cma -linkpkg $^ \ + -cclib '$(OCAMLCLIBS)' \ + -custom \ + $(OCAML_GCOV_LDFLAGS) \ + -...

...s (optional). AC_CHECK_PROG([XGETTEXT],[xgettext],[xgettext],[no]) diff --git a/customize/Makefile.am b/customize/Makefile.am index f9dccd5..64509fd 100644 --- a/customize/Makefile.am +++ b/customize/Makefile.am @@ -124,7 +124,7 @@ OCAMLCFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) $(OCAMLPACKAGES) OCAMLOPTFLAGS = $(OCAMLCFLAGS) OCAMLCLIBS = \ - $(LIBXML2_LIBS) $(LIBINTL) -ltinfo -lcrypt \ + $(LIBXML2_LIBS) $(LIBINTL) $(LIBCURSES_LIBS) -lcrypt \ -L../src/.libs -lutils \ -L../gnulib/lib/.libs -lgnu diff --git a/mllib/Makefile.am b/mllib/Makefile.am index d248a72..112b610 100644 --- a/mllib/Makefi...

...oesn't contain 'UP']) ]) LIBS="$old_LIBS" diff --git a/customize/Makefile.am b/customize/Makefile.am index c945685..f9dccd5 100644 --- a/customize/Makefile.am +++ b/customize/Makefile.am @@ -124,7 +124,7 @@ OCAMLCFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) $(OCAMLPACKAGES) OCAMLOPTFLAGS = $(OCAMLCFLAGS) OCAMLCLIBS = \ - $(LIBXML2_LIBS) $(LIBINTL) -lncurses -lcrypt \ + $(LIBXML2_LIBS) $(LIBINTL) -ltinfo -lcrypt \ -L../src/.libs -lutils \ -L../gnulib/lib/.libs -lgnu diff --git a/mllib/Makefile.am b/mllib/Makefile.am index 567ff84..d248a72 100644 --- a/mllib/Makefile.am ++...

This just fixes 'make'. 'make check' is still broken. Further patches for that to follow tomorrow. Rich.

...n_LDADD = \ $(top_builddir)/src/libguestfs.la \ $(LIBXML2_LIBS) \ $(LIBVIRT_LIBS) \ + $(LTLIBINTL) \ ../gnulib/lib/libgnu.la \ -lm diff --git a/builder/Makefile.am b/builder/Makefile.am index 206abce..f747fc3 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -168,6 +168,7 @@ OCAMLOPTFLAGS = $(OCAMLCFLAGS) OCAMLCLIBS = \ $(LIBLZMA_LIBS) \ $(LIBXML2_LIBS) \ + $(LIBINTL) \ -L../src/.libs -lutils \ -L../gnulib/lib/.libs -lgnu \ -pthread -lpthread \ @@ -299,6 +300,7 @@ virt_index_validate_CPPFLAGS = \ -DLOCALEBASEDIR=\""$(datadir)/locale"\" virt_inde...

...$(LIBXML2_LIBS) \ > $(LIBVIRT_LIBS) \ > + $(LTLIBINTL) \ > ../gnulib/lib/libgnu.la \ > -lm > > diff --git a/builder/Makefile.am b/builder/Makefile.am > index 206abce..f747fc3 100644 > --- a/builder/Makefile.am > +++ b/builder/Makefile.am > @@ -168,6 +168,7 @@ OCAMLOPTFLAGS = $(OCAMLCFLAGS) > OCAMLCLIBS = \ > $(LIBLZMA_LIBS) \ > $(LIBXML2_LIBS) \ > + $(LIBINTL) \ > -L../src/.libs -lutils \ > -L../gnulib/lib/.libs -lgnu \ > -pthread -lpthread \ > @@ -299,6 +300,7 @@ virt_index_validate_CPPFLAGS = \ > -DLOCALEBASEDIR=\"&quo...

Hi, this patch serie does a small optimisation in virt-builder, i.e. make its internal Downloader just copy files when the source is a local URI, instead of spawn curl in this case too. Pino Toscano (3): builder: isolate C libraries in an own OCAMLCLIBS builder: prepare for different per-protocol download actions builder: do a copy when downloading local files builder/Makefile.am | 13

Hi, continuing what started a couple of weeks ago [1], the attached patch series continues the work in making it easier to build and run libguestfs (in fixed appliance mode) on OSes different than Linux. The provided changes should cause no functional changes on Linux. [1] https://www.redhat.com/archives/libguestfs/2014-October/msg00176.html Thanks, -- Pino Pino Toscano (9): build: check

Here are two more patches that I had missed before.

i''m the Mageia Xen package maintainer, and a user reported that i had missing symbols in my ocaml bindings: https://bugs.mageia.org/show_bug.cgi?id=5199 i''m using Xen 4.2.1 and ocaml 3.12.1 the problem is that if you just to a simple hello world and you''re using certain bindings (eg: xeneventch): you get missing symbols. (others appear to be fine). I know next to

From: "Richard W.M. Jones" <rjones at redhat.com> --- configure.ac | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index fa97479..6e42423 100644 --- a/configure.ac +++ b/configure.ac @@ -141,6 +141,10 @@ if test "$gl_gcc_warnings" = yes; then # Work around warning in src/inspect.c. This seems to be a bug in gcc

Make use of Unix.isatty instead of our TTY.isatty_stdout, as the supported OCaml provides the former already. --- mllib/common_utils.ml | 10 +++++----- mllib/progress.ml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml index 295981c..9fcd8dd 100644 --- a/mllib/common_utils.ml +++ b/mllib/common_utils.ml @@ -207,15 +207,15