search for: have_ocamlopt

...virt-p2v-make-disk], [chmod +x,-w p2v/virt-p2v-make-disk]) AC_CONFIG_FILES([p2v/virt-p2v-make-kickstart], diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4 index e08f40a02..fea11a334 100644 --- a/m4/guestfs-ocaml.m4 +++ b/m4/guestfs-ocaml.m4 @@ -59,6 +59,24 @@ AM_CONDITIONAL([HAVE_OCAMLOPT], AM_CONDITIONAL([HAVE_OCAMLDOC], [test "x$OCAMLDOC" != "xno"]) +dnl Check if ocamlc/ocamlopt -runtime-variant _pic works. It was +dnl added in OCaml >= 4.03, but in theory might be disabled by +dnl downstream distros. +OCAML_RUNTIME_VARIANT_PIC_OPTION=&qu...

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

...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/configure.ac +++ libguestfs-1.20.1/configure.ac @@ -865,6 +865,8 @@ AS_IF([test &...

...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) +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: $(OB...

* 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

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

...bdir-rules.mk b/subdir-rules.mk index dd59349..525d210 100644 --- a/subdir-rules.mk +++ b/subdir-rules.mk @@ -47,6 +47,12 @@ LOG_DRIVER = env $(SHELL) $(top_srcdir)/build-aux/guestfs-test-driver # See also: # guestfs-hacking(1) section "HOW OCAML PROGRAMS ARE COMPILED AND LINKED" +if !HAVE_OCAMLOPT +MLARCHIVE = cma +else +MLARCHIVE = cmxa +endif + .mli.cmi: $(OCAMLFIND) ocamlc $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@ .ml.cmo: diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index 25193b2..1504df2 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -135,7 +135,11 @@ BE...

...sigchecker.cmo \ + index_parser.cmo \ + list_entries.cmo \ + cmdline.cmo \ + builder.cmo + +OBJECTS_opt = \ $(top_builddir)/mllib/libdir.cmx \ $(top_builddir)/mllib/common_gettext.cmx \ $(top_builddir)/mllib/common_utils.cmx \ @@ -66,6 +89,12 @@ OBJECTS = \ cmdline.cmx \ builder.cmx +if HAVE_OCAMLOPT +FINAL_BINARY = virt-builder.opt +else +FINAL_BINARY = virt-builder.bc +endif + bin_SCRIPTS = virt-builder # -I $(top_builddir)/src/.libs is a hack which forces corresponding -L @@ -73,7 +102,6 @@ bin_SCRIPTS = virt-builder # installed copy of libguestfs. OCAMLPACKAGES = \ -package str,unix...

...------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 109d2c8..4dc6f12 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,18 +56,18 @@ SOURCES_ML = $(filter %.ml,$(SOURCES)) BOBJECTS = $(SOURCES_ML:.ml=.cmo) XOBJECTS = $(SOURCES_ML:.ml=.cmx) -if !HAVE_OCAMLOPT -OBJECTS = $(BOBJECTS) -else -OBJECTS = $(XOBJECTS) -endif - OCAMLPACKAGES = -package unix,str OCAMLFLAGS = -warn-error CDEFLMPSUVXYZ -febootstrap: $(OBJECTS) - $(OCAMLFIND) $(OCAMLBEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) -linkpkg \ +if !HAVE_OCAMLOPT +febootstrap: $(BOBJECTS) + $(OCAMLFIND) ocamlc...

...$(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.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.c...

...ES_C = \ + dummy.c + +# We pretend that we're building a C library. automake handles the +# compilation of the C sources for us. At the end we take the C +# objects and OCaml objects and link them into the OCaml library. +# This C library is never used. + +noinst_LIBRARIES = libmlv2v.a + +if !HAVE_OCAMLOPT +MLV2V_CMA = mlv2v.cma +else +MLV2V_CMA = mlv2v.cmxa +endif + +noinst_DATA = $(MLV2V_CMA) + +libmlv2v_a_SOURCES = $(SOURCES_C) +libmlv2v_a_CPPFLAGS = \ + -DCAML_NAME_SPACE \ + -I. \ + -I$(top_builddir) \ + -I$(shell $(OCAMLC) -where) +libmlv2v_a_CFLAGS = \ + $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + -fPI...

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

...+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 '$(OCAMLCLIBS)' -- \ $(OCAMLF...

...test). --- mllib/Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/mllib/Makefile.am b/mllib/Makefile.am index 0b43684..e363f27 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -132,9 +132,6 @@ libdir.ml: Makefile # Tests. -check_SCRIPTS = \ - common_utils_tests - if HAVE_OCAMLOPT common_utils_tests.cmx: OCAMLPACKAGES += $(OCAMLPACKAGES_TESTS) common_utils_tests: config.cmx common_gettext.cmx common_utils.cmx common_utils_tests.cmx -- 2.1.0

...-) diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index e781363..a535b43 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -142,9 +142,9 @@ endif TESTS = run-bindtests $(test_progs_all) -noinst_DATA += bindtests.bc $(test_progs_all) +check_DATA = bindtests.bc $(test_progs_all) if HAVE_OCAMLOPT -noinst_DATA += bindtests.opt +check_DATA += bindtests.opt endif %.bc: %.cmo mlguestfs.cma @@ -204,6 +204,6 @@ install-data-hook: rm $(DESTDIR)$(OCAMLLIB)/guestfs/bindtests.* rm $(DESTDIR)$(OCAMLLIB)/guestfs/libguestfsocaml.a -CLEANFILES += $(noinst_DATA) +CLEANFILES += $(noinst_DATA) $(c...

...aml/Makefile.am +++ b/ocaml/Makefile.am @@ -64,14 +64,14 @@ endif stamp-mlguestfs: libguestfsocaml.a $(guestfs_cmm) $(OCAMLMKLIB) -o mlguestfs \ + -ldopt '$(LDFLAGS)' \ $(libguestfsocaml_a_OBJECTS) guestfs.cmo \ - $(LDFLAGS) \ $(LTLIBINTL) \ -L../lib/.libs -lguestfs if HAVE_OCAMLOPT $(OCAMLMKLIB) -o mlguestfs \ + -ldopt '$(LDFLAGS)' \ $(libguestfsocaml_a_OBJECTS) guestfs.cmx \ - $(LDFLAGS) \ $(LTLIBINTL) \ -L../lib/.libs -lguestfs endif -- 2.17.1

...Makefile.am b/src/Makefile.am index 7f99b8a..932881b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -104,17 +104,18 @@ supermin_CFLAGS = \ BOBJECTS = $(SOURCES_ML:.ml=.cmo) XOBJECTS = $(SOURCES_ML:.ml=.cmx) +OCAMLPACKAGES = -package unix,str +OCAMLFLAGS = -warn-error CDEFLMPSUVXYZ + if !HAVE_OCAMLOPT OBJECTS = $(BOBJECTS) BEST = c +OCAMLFLAGS += -custom else OBJECTS = $(XOBJECTS) BEST = opt endif -OCAMLPACKAGES = -package unix,str -OCAMLFLAGS = -warn-error CDEFLMPSUVXYZ - supermin_DEPENDENCIES = $(OBJECTS) ext2init-bin.o supermin_LDADD = ext2init-bin.o ../lib/libgnu.a -- 1.9....

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 |

...common/mlstdutils/Makefile.am @@ -48,7 +48,12 @@ else MLSTDUTILS_CMA = mlstdutils.cmxa endif -noinst_DATA = $(MLSTDUTILS_CMA) +# Just for this library, we need to build both bytecode and native +# code because the generator always requires the bytecode version. +noinst_DATA = mlstdutils.cma +if HAVE_OCAMLOPT +noinst_DATA += mlstdutils.cmxa +endif libmlstdutils_a_SOURCES = dummy.c libmlstdutils_a_CPPFLAGS = \ @@ -79,8 +84,13 @@ endif libmlstdutils_a_DEPENDENCIES = $(OBJECTS) -$(MLSTDUTILS_CMA): $(OBJECTS) - $(OCAMLFIND) mklib $(OCAMLPACKAGES) $(OBJECTS) -o mlstdutils +mlstdutils.cma: $(BOBJECTS...

Still don't recommend you use 'make install', but here we go. Rich.