search for: ocamllib

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

Rather than always trying to install ocaml files into $(OCAMLLIBS), which is likely to be root-owned and therefore fail during a './configure --prefix=$HOME/subdir', we instead choose to always install relative to $(prefix) and let distro packagers take steps post-install to move the distro's pre-built copy into the correct location for the distro....

...TS = 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) $(check_DATA) endif -- 2.5.0

...dtests.opt \ + bindtests.bc +if HAVE_OCAMLOPT +noinst_DATA += \ + bindtests.opt \ $(test_progs:%=%.bc) \ $(test_progs:%=%.opt) +endif bindtests.bc: bindtests.cmo mlguestfs.cma mkdir -p t @@ -217,7 +231,7 @@ install-data-hook: $(OCAMLFIND) install \ -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \ guestfs \ - META *.so *.a *.cma *.cmx *.cmxa *.cmi $(srcdir)/*.mli + $(DATA_HOOK_FILES) rm $(DESTDIR)$(OCAMLLIB)/guestfs/bindtests.* rm $(DESTDIR)$(OCAMLLIB)/guestfs/libguestfsocaml.a Index: libguestfs-1.20.1/resize/Makefile.am ======================================================...

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

On Fri, Dec 07, 2018 at 03:09:43PM -0600, Eric Blake wrote: > Rather than always trying to install ocaml files into $(OCAMLLIBS), > which is likely to be root-owned and therefore fail during a > './configure --prefix=$HOME/subdir', we instead choose to always > install relative to $(prefix) and let distro packagers take steps > post-install to move the distro's pre-built copy into the correct > l...

...at Inc. +# Copyright (C) 2009-2010, 2012 Red Hat Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -97,7 +97,6 @@ install_files += *.cmx *.cmxa endif install-data-hook: - mkdir -p $(DESTDIR)$(OCAMLLIB) mkdir -p $(DESTDIR)$(OCAMLLIB)/stublibs $(OCAMLFIND) install \ -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \ -- 1.7.12.116.g31e0100

...18 @@ depend: .depend SUFFIXES = .cmo .cmi .cmx .ml .mli .mll .mly # Do the installation by hand, because we want to run ocamlfind. +data_hook_files = META *.so *.a *.cma *.cmi $(srcdir)/*.mli +if HAVE_OCAMLOPT +data_hook_files += *.cmx *.cmxa +endif + install-data-hook: mkdir -p $(DESTDIR)$(OCAMLLIB) mkdir -p $(DESTDIR)$(OCAMLLIB)/stublibs $(OCAMLFIND) install \ -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \ guestfs \ - META *.so *.a *.cma *.cmx *.cmxa *.cmi $(srcdir)/*.mli + $(data_hook_files) rm $(DESTDIR)$(OCAMLLIB)/guestfs/bindtests.* rm $(DESTDIR)$(OCAMLLIB)/guestfs/l...

Hi Rich, I ran these commands as non-root: ./autogen.sh && make && make distcheck It got most of the way through, but failed in the VPATH part while rebuilding from a ./_build subdir, like this: make[4]: Entering directory `/h/j/w/co/hivex/hivex-1.3.6/_build/ocaml' mkdir -p /usr/lib64/ocaml mkdir -p /usr/lib64/ocaml/stublibs ocamlfind install \

--- builder/Makefile.am | 18 +++++++++++++- configure.ac | 2 ++ mllib/Makefile.am | 60 +++++++++++++++++++++++++++++++--------------- ocaml/Makefile.am | 28 +++++++++++++++------- ocaml/examples/Makefile.am | 13 ++++++++++ resize/Makefile.am | 18 +++++++++++++- sparsify/Makefile.am | 18 +++++++++++++- sysprep/Makefile.am | 18

...HECK_LIB here unfortunately because + dnl the other symbols are resolved by OCaml itself. + AC_MSG_CHECKING([which OCaml runtime we should link the daemon with]) + if test "x$OCAMLOPT" != "xno"; then + for f in asmrun_pic asmrun; do + if test -f "$OCAMLLIB/lib$f.a"; then + CAMLRUN=$f + break + fi + done + else + for f in camlrun; do + if test -f "$OCAMLLIB/lib$f.a"; then + CAMLRUN=$f + break + fi + done + fi + if t...

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

...gins/ocaml/Makefile.am | 4 ++-- tests/Makefile.am | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/ocaml/Makefile.am b/plugins/ocaml/Makefile.am index 484d041..b95f255 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:...

...IBS) + +v2v_test_harness.cmxa: $(XOBJECTS) + $(OCAMLMKLIB) $^ -o v2v_test_harness $(LIBXML2_LIBS) + +# We have to recompile *.c files with -fPIC. Do that by building an +# uninstalled library. +noinst_LIBRARIES = libv2vth.a + +libv2vth_a_CPPFLAGS = \ + -DGUESTFS_PRIVATE=1 \ + -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \ + -I$(top_srcdir)/src -I$(top_builddir)/src \ + -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib + +libv2vth_a_CFLAGS = \ + $(WARN_CFLAGS) $(WERROR_CFLAGS) \ + $(LIBXML2_CFLAGS) \ + -fPIC + +libv2vth_a_SOURCES = \ + ../xml-c.c + +# Dependencies. + +.mli.cmi: + $(OCAM...

...ts.opt $(test_progs_all) +noinst_DATA += $(bindtests_all) $(test_progs_all) %.bc: %.cmo mlguestfs.cma $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ @@ -171,7 +193,7 @@ install-data-hook: $(OCAMLFIND) install \ -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \ guestfs \ - META *.so *.a *.cma *.cmx *.cmxa *.cmi $(srcdir)/*.mli + $(DATA_HOOK_FILES) rm $(DESTDIR)$(OCAMLLIB)/guestfs/bindtests.* rm $(DESTDIR)$(OCAMLLIB)/guestfs/libguestfsocaml.a diff --git a/ocaml/examples/Makefile.am b/ocaml/examples/Makefile.am index 200a0aa..3dadf03 100644...

As I'm now working through the enormous virt-v2v/virt-p2v bug list, we need a high quality set of tests to ensure that we don't accidentally regress some old OS/hypervisor combination while making changes. The test cases are going to be huge, so we cannot possibly distribute them in libguestfs. Furthermore many of them have licensing problems which means we cannot redistribute them at

...$(shell $(OCAMLC) -where) \ diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index 4d13eed97..b31e8fc65 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -78,6 +78,7 @@ endif touch $@ libguestfsocaml_a_CPPFLAGS = \ + -DCAML_NAME_SPACE \ -DGUESTFS_PRIVATE=1 \ -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \ -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ diff --git a/v2v/Makefile.am b/v2v/Makefile.am index b5761ef46..277b95c31 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -179,6 +179,7 @@ bin_PROGRAMS = virt-v2v virt-v2v-copy-to-local virt_v2v_SOURCE...

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

...diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index d65ebaa..462404c 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -29,7 +29,8 @@ CLEANFILES = *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so CLEANFILES += t/*.cmi t/*.cmo t/*.cmx t/*.o t/*.a t/*.so AM_CPPFLAGS = -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \ - -I$(top_srcdir)/src -I$(top_builddir)/src + -I$(top_srcdir)/src -I$(top_builddir)/src \ + $(WARN_CFLAGS) $(WERROR_CFLAGS) if HAVE_OCAML -- 1.6.4.1.359.g4fc77

...the non-root --prefix. 'make distcheck' still doesn't pass for me; the next failure is due to attempts to overwrite root-owned ocaml files. Similar symptoms as what this patch addressed for bashcompsdir, but there we aren't using pkg-config --variable. Instaed, our definition of ocamllibdir (based on ${OCAMLLIB} in m4/ocaml.m4) is coming from 'ocamlc -where', and I have no idea how to coerce that to print a relative pathname, or even if it is common to have ocaml libraries installed in a non-root home directory but which can still be picked up by ocaml at runtime. configu...