search for: ocaml_flags

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

.../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],[ocaml-gettext],[ocaml-gettext],[no]) AM_CONDIT...

...CAMLCLIBS)' -- \ $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) $(OCAMLLINKFLAGS) \ diff --git a/customize/Makefile.am b/customize/Makefile.am index 4befc75..dd35cdc 100644 --- a/customize/Makefile.am +++ b/customize/Makefile.am @@ -165,7 +165,8 @@ OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) virt_customize_DEPENDENCIES = \ $(top_srcdir)/ocaml-link.sh \ $(CUSTOMIZE_THEOBJECTS) \ - $(CUSTOMIZE_CMA) + $(CUSTOMIZE_CMA) \ + ../mllib/mllib.$(MLARCHIVE) virt_customize_LINK = \ $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \ $(OCAMLFIND) $(BEST)...

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

...+AC_SUBST([LIBCURSES_LIBS]) dnl GNU gettext tools (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...

...ibrary (usually part of ncurses) not found, or it doesn'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 inde...

...opies 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

....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_builder_DEPENDENCIES = $(OBJECTS) +virt_builder_DEPENDENCIES = $(OBJECTS) $(top_srcdir)/ocaml-link.sh virt_builder_LINK = \ - ./link.sh \ + $(top_srcdir)/ocaml-link.sh -cclib...

...]) + dnl Default backend. AC_MSG_CHECKING([if the user specified a default backend]) AC_ARG_WITH([default-backend], diff --git a/customize/Makefile.am b/customize/Makefile.am index 56c5ad5..c945685 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) -lncurses -lcrypt \ + $(LIBXML2_LIBS) $(LIBINTL) -lncurses -lcrypt \ -L../src/.libs -lutils \ -L../gnulib/lib/.libs -lgnu diff --git a/df/Makefile.am b/df/Makefile.am index 29e0bf5..e56a...

..._MSG_CHECKING([if the user specified a default backend]) > AC_ARG_WITH([default-backend], > diff --git a/customize/Makefile.am b/customize/Makefile.am > index 56c5ad5..c945685 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) -lncurses -lcrypt \ > + $(LIBXML2_LIBS) $(LIBINTL) -lncurses -lcrypt \ > -L../src/.libs -lutils \ > -L../gnulib/lib/.libs -lgnu > > diff --git a/df/Mak...

OCaml 4.02 introduced the 'bytes' type, a mutable string intended to replace the existing 'string' type for those cases where the byte array can be mutated. In future the 'string' type will become immutable. This is not the default now, but it can be forced using the '-safe-string' compile option. I tested this on Fedora 24 (OCaml 4.02) & RHEL 7 (OCaml 4.01).

...$(top_builddir) \ + -I$(shell $(OCAMLC) -where) +libmlv2v_a_CFLAGS = \ + $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + -fPIC + +BOBJECTS = $(SOURCES_ML:.ml=.cmo) +XOBJECTS = $(BOBJECTS:.cmo=.cmx) + +OCAMLPACKAGES = \ + -package str,unix \ + -I $(builddir) +OCAMLPACKAGES_TESTS = $(MLV2V_CMA) + +OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)' + +if !HAVE_OCAMLOPT +OBJECTS = $(BOBJECTS) +else +OBJECTS = $(XOBJECTS) +endif + +libmlv2v_a_DEPENDENCIES = $(OBJECTS) + +$(MLV2V_CMA): $(OBJECTS) libmlv2v.a + $(OCAMLFIND) mklib $(OCAMLPACKAGES) \ + $(OBJECTS) $(libmlv2v_a_OBJECTS) -o mlv2v + +#...

v1 was here: https://www.redhat.com/archives/libguestfs/2017-November/msg00068.html v1 -> v2: - Use a configure-time test. Rich.

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

....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 $@ I thnk this line should be: $(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@ otherwise you are dropping warning flags. Howeve...

...harness/Makefile.am @@ -40,7 +40,7 @@ OCAMLPACKAGES = \ -I $(top_builddir)/common/mlstdutils \ -I $(top_builddir)/common/mlxml \ -I $(top_builddir)/common/mltools \ - -I $(top_builddir)/common/mllibvirt \ + -I $(top_builddir)/3rdparty/libvirt-ocaml \ -I $(top_builddir)/v2v OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)' diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 48d3f515..116a8d2f 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -212,7 +212,7 @@ OCAMLPACKAGES = \ -I $(top_builddir)/common/mlpcre \ -I $(top_builddir)/common/mlxml \ -I $(top_buildd...

.../Makefile.am | 2 -- m4/guestfs-ocaml.m4 | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index af3184d3e..27630d2bc 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -328,10 +328,8 @@ OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) if !HAVE_OCAMLOPT OBJECTS = $(BOBJECTS) -CAMLRUN = camlrun else OBJECTS = $(XOBJECTS) -CAMLRUN = asmrun endif OCAML_LIBS = \ -lmlpcre \ diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4 index 54ad355cd..3f78d1fb3 100644 --- a/m4/guestfs-ocaml.m4 +++ b/m4/guestfs-...

...m +++ b/generator/Makefile.am @@ -114,9 +114,6 @@ sources = \ # In build dependency order. objects = \ - $(OCAML_BYTES_COMPAT_CMO) \ - ../common/mlstdutils/guestfs_config.cmo \ - ../common/mlstdutils/std_utils.cmo \ types.cmo \ utils.cmo \ proc_nr.cmo \ @@ -178,7 +175,12 @@ OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) noinst_PROGRAM = generator generator: $(objects) - $(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) -linkpkg $^ -o $@ +# We need the recursive make here because the generator is +# rebuilt in ‘make clean’. + $(MAKE) -C $(top_builddir)/common/mlstdutils mlstdutils.cma + $(...

...m +++ b/generator/Makefile.am @@ -114,9 +114,6 @@ sources = \ # In build dependency order. objects = \ - $(OCAML_BYTES_COMPAT_CMO) \ - ../common/mlstdutils/guestfs_config.cmo \ - ../common/mlstdutils/std_utils.cmo \ types.cmo \ utils.cmo \ proc_nr.cmo \ @@ -178,7 +175,12 @@ OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) noinst_PROGRAM = generator generator: $(objects) - $(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) -linkpkg $^ -o $@ +# We need the recursive make here because the generator is +# rebuilt in ‘make clean’. + $(MAKE) -C $(top_builddir)/common/mlstdutils mlstdutils.cma + $(...

...uestfsd.pod if INSTALL_DAEMON @@ -280,7 +281,8 @@ XOBJECTS = $(BOBJECTS:.cmo=.cmx) OCAMLPACKAGES = \ -package str,unix,hivex \ -I $(top_srcdir)/common/mlstdutils \ - -I $(top_srcdir)/common/mlutils + -I $(top_srcdir)/common/mlutils \ + -I $(top_builddir)/common/utils/.libs OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_FLAGS) @@ -307,6 +309,45 @@ camldaemon.o: $(OBJECTS) -linkpkg mlcutils.$(MLARCHIVE) mlstdutils.$(MLARCHIVE) \ $(OBJECTS) +# Unit tests. + +check_PROGRAMS = daemon_utils_tests +TESTS = daemon_utils_tests + +daemon_utils_tests_SOURCES = dummy.c +daemon_utils_tests_CPPFLA...