search for: ocamlclib

...v/Makefile.am @@ -248,9 +248,9 @@ OCAMLLINKFLAGS = \ mlv2v.$(MLARCHIVE) \ $(LINK_CUSTOM_OCAMLC_ONLY) -virt_v2v_DEPENDENCIES = $(OBJECTS) $(top_srcdir)/ocaml-link.sh +virt_v2v_DEPENDENCIES = $(OBJECTS) $(top_builddir)/ocaml-link.sh virt_v2v_LINK = \ - $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ + $(top_builddir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \ $(OBJECTS) -o $@ @@ -293,9 +293,9 @@ virt_v2v_copy_to_local_DEPENDENCIES = \ ../bundled/libvirt-ocaml/mllibvirt.$(MLARCHIVE) \ ../com...

Building virt-v2v out-of-tree does not work and requires several small fixes here and there. Tomáš Golembiovský (3): build: perform gnulib check from source directory build: run ocaml-link.sh from build directory docs: don't perform lookup on absolute paths cfg.mk | 1 + podwrapper.pl.in | 2 ++ v2v/Makefile.am | 16 ++++++++-------- 3 files changed, 11 insertions(+), 8

...ze.cmxa endif -virt_builder_DEPENDENCIES = $(OBJECTS) $(top_srcdir)/ocaml-link.sh +virt_builder_DEPENDENCIES = \ + $(OBJECTS) \ + ../mllib/mllib.$(MLARCHIVE) \ + ../customize/customize.$(MLARCHIVE) \ + $(top_srcdir)/ocaml-link.sh virt_builder_LINK = \ $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLLINKFLAGS) \ @@ -236,7 +240,11 @@ yajl_tests_THEOBJECTS = $(yajl_tests_BOBJECTS) yajl_tests.cmo: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS) endif -yajl_tests_DEPENDENCIES = $(yajl_tests_THEOBJECTS) $(top_srcdir)/ocaml-link....

...mon_utils.cmx \ @@ -109,6 +109,12 @@ OBJECTS = \ cmdline.cmx \ builder.cmx +if HAVE_OCAMLOPT +OBJECTS = $(deps) +else +OBJECTS = $(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...

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

.../v2v/link.sh /v2v/oUnit-* /v2v/rhel-5.10.img /v2v/rhel-6.5.img diff --git a/builder/Makefile.am b/builder/Makefile.am index bfe2f79..182f5a4 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -150,6 +150,16 @@ if HAVE_OCAML_PKG_GETTEXT OCAMLPACKAGES += -package gettext-stub endif +OCAMLCLIBS = \ + -pthread -lpthread \ + -lutils \ + $(LIBTINFO_LIBS) \ + $(LIBCRYPT_LIBS) \ + $(LIBLZMA_LIBS) \ + $(LIBXML2_LIBS) \ + $(LIBINTL) \ + -lgnu + OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) if !HAVE_OCAMLOPT @@ -162,9 +172,9 @@ BEST = opt OCAMLLINKFLAGS = mlguestfs.cmxa endif -virt_...

OCaml has a small runtime which is statically linked into the virt tools (providing things like GC and primitives). Since OCaml 4.03 it has been possible to select variants of this runtime, one of which is compiled with -fPIC, using ‘ocamlopt -runtime-variant _pic’. This has performance implications on i686, but is relatively free on other architectures. Since it (in theory) adds to the

...r/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$OCAMLC" != "xno" &amp...

...ile.am index 7b66afb..e64a696 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -24,7 +24,8 @@ AM_CFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/fish \ -pthread \ - $(LIBLZMA_CFLAGS) + $(LIBLZMA_CFLAGS) \ + $(LIBCURSES_CFLAGS) EXTRA_DIST = \ $(SOURCES) \ @@ -172,7 +173,7 @@ OCAMLCLIBS = \ -L../src/.libs -lutils \ -L../gnulib/lib/.libs -lgnu \ -pthread -lpthread \ - -ltinfo -lcrypt + $(LIBCURSES_LIBS) -lcrypt if HAVE_OCAMLOPT virt-builder: $(OBJECTS) diff --git a/configure.ac b/configure.ac index a571de5..1c38084 100644 --- a/configure.ac +++ b/configure.ac @@ -352,19...

...GES = \ + -package str,unix \ + -I $(top_builddir)/ocaml + if HAVE_OCAML_PKG_GETTEXT OCAMLPACKAGES += -package gettext-stub endif OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES) -OCAMLOPTFLAGS = $(OCAMLCFLAGS) +OCAMLOPTFLAGS = \ + -I $(top_builddir)/src/.libs \ + $(OCAMLCFLAGS) OCAMLCLIBS = \ $(LIBXML2_LIBS) -lncurses -lcrypt \ -L../src/.libs -lutils \ -L../gnulib/lib/.libs -lgnu -dummy: $(OBJECTS) +dummy.bc: $(OBJECTS_bc) + $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ + $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) \ + -custom \ + mlgu...

...arsify/link.sh.in | 2 +- sysprep/Makefile.am | 2 +- v2v/link.sh.in | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/builder/Makefile.am b/builder/Makefile.am index f747fc3..7b66afb 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -172,7 +172,7 @@ OCAMLCLIBS = \ -L../src/.libs -lutils \ -L../gnulib/lib/.libs -lgnu \ -pthread -lpthread \ - -lncurses -lcrypt + -ltinfo -lcrypt if HAVE_OCAMLOPT virt-builder: $(OBJECTS) diff --git a/configure.ac b/configure.ac index 3165e96..8916ebd 100644 --- a/configure.ac +++ b/configure.ac @@ -355,14 +355,14...

...index 2a196d45d..104420d13 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -197,6 +197,7 @@ virt_v2v_CPPFLAGS = \ -I$(top_srcdir)/lib virt_v2v_CFLAGS = \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + $(LIBGUESTFS_CFLAGS) \ $(LIBVIRT_CFLAGS) \ $(LIBOSINFO_CFLAGS) @@ -230,6 +231,7 @@ endif OCAMLCLIBS = \ -lqemuopts \ + $(LIBGUESTFS_LIBS) \ $(LIBVIRT_LIBS) \ $(LIBXML2_LIBS) \ $(JANSSON_LIBS) \ -- 2.24.1

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 ++++++- builder/downloader.ml | 95 +++++++++++++++++++++++++++++++-------------------- 2 files changed, 70 insertions(+), 38 deletions(-) -- 1.8.3.1

...c/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_index_validate_LDADD = \ + $(LTLI...

...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"\" &...

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

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

Just like the similar series that already went in for libguestfs [1], do similar fixes also for virt-v2v, with additional fixes for the builddir!=srcdir case. This 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

..._builddir)/customize/perl_edit.cmo \ - $(top_builddir)/customize/crypt.cmo \ - $(top_builddir)/customize/password.cmo \ - $(top_builddir)/customize/ssh_key.cmo \ - $(top_builddir)/customize/customize_run.cmo \ $(SOURCES_ML:.ml=.cmo) XOBJECTS = $(BOBJECTS:.cmo=.cmx) @@ -162,8 +146,6 @@ endif OCAMLCLIBS = \ -lutils \ - $(LIBTINFO_LIBS) \ - $(LIBCRYPT_LIBS) \ $(LIBVIRT_LIBS) \ $(LIBXML2_LIBS) \ $(LIBINTL) \ -- 2.1.0

...; +++ b/v2v/Makefile.am > @@ -197,6 +197,7 @@ virt_v2v_CPPFLAGS = \ > -I$(top_srcdir)/lib > virt_v2v_CFLAGS = \ > $(WARN_CFLAGS) $(WERROR_CFLAGS) \ > + $(LIBGUESTFS_CFLAGS) \ > $(LIBVIRT_CFLAGS) \ > $(LIBOSINFO_CFLAGS) > > @@ -230,6 +231,7 @@ endif > > OCAMLCLIBS = \ > -lqemuopts \ > + $(LIBGUESTFS_LIBS) \ > $(LIBVIRT_LIBS) \ > $(LIBXML2_LIBS) \ > $(JANSSON_LIBS) \ LGTM. Thanks, -- Pino Toscano