similar to: [PATCH 1/2] ocaml: Factor out flags into configure script.

Hardcoding -ltinfo breaks on distros that do not build the sep library (which is the default ncurses behavior). Use pkg-config to look up the right libraries regardless of how the distro built things. --- builder/Makefile.am | 5 +++-- configure.ac | 18 ++++++------------ customize/Makefile.am | 2 +- mllib/Makefile.am | 6 +++--- resize/Makefile.am | 2 +-

On Thu, Jan 17, Richard W.M. Jones wrote: > On Wed, Jan 16, 2013 at 05:51:53PM +0100, Olaf Hering wrote: > > On Mon, Jan 14, Olaf Hering wrote: > > > This is a first attempt to build libguestfs with just a ocaml bytecode > > > compiler. The three tools written in ocaml will be build only when an > > > ocamlopt compiler is available. > > Here is a more

In tools except guestfish, we don't use ncurses, or even curses, just 2 termcap functions and a global variable. These are provided by libtinfo, so just link to that. In guestfish we use readline which needs ncurses. Leave that alone. --- builder/Makefile.am | 2 +- configure.ac | 12 ++++++------ customize/Makefile.am | 2 +- mllib/Makefile.am | 6 +++---

Look for libint/gettext and link to it; this properly detects whether libint is part of libc. --- align/Makefile.am | 1 + builder/Makefile.am | 2 ++ cat/Makefile.am | 4 ++++ configure.ac | 3 +++ customize/Makefile.am | 2 +- df/Makefile.am | 1 + diff/Makefile.am | 1 + edit/Makefile.am | 1 + erlang/Makefile.am

On Tue, Nov 04, 2014 at 04:35:26PM +0100, Pino Toscano wrote: > Look for libint/gettext and link to it; this properly detects whether > libint is part of libc. I'm a little confused by this patch, and also worried that it may be reverting commit 75514ab57a. Does this require gettextize? Rich. > --- > align/Makefile.am | 1 + > builder/Makefile.am | 2 ++ >

Create a single ocaml-link.sh script, which supports a -cclib parameter so it can be used instead of the per-project link.sh scripts. As result, the libraries for each OCaml application can be moved back to each Makefile.am. --- .gitignore | 7 ------- builder/Makefile.am | 14 ++++++++++++-- builder/link.sh.in | 22 ---------------------- configure.ac | 14

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

Binaries should be rebuilt if mllib.cma/mllib.cmxa or customize.cma/customize.cmxa change. Fixes commit 1e2877c6f4d1d254026d38b1cac4895d8dba7d5d. --- builder/Makefile.am | 12 ++++++++++-- customize/Makefile.am | 3 ++- dib/Makefile.am | 5 ++++- get-kernel/Makefile.am | 5 ++++- mllib/Makefile.am | 15 ++++++++++++--- resize/Makefile.am | 5 ++++- sparsify/Makefile.am

Add makefile variables to enable silent rules for simple command invocations, such as ocamlc, ocamlopt, javac, and erlc. This reduces the log output when building with silent rules, still showing the full command lines otherwise. --- erlang/Makefile.am | 2 +- java/Makefile.am | 6 +++--- ocaml/Makefile.am | 14 +++++++------- subdir-rules.mk | 20 +++++++++++++++++--- 4 files changed,

Once ocamlfind is installed, 'make' failed for me with: ocamlfind ocamlc -g -annot -safe-string -warn-error CDEFLMPSUVYZX+52-3 -ccopt '-gdwarf' -package unix -c NBD.ml -o NBD.cmo File "NBD.ml", line 1: Error: Could not find the .cmi file for interface NBD.mli. make[2]: *** [Makefile:823: NBD.cmo] Error 2 I'm not positive that this is the perfect fix, but it at least

On Sat, Jun 15, 2019 at 04:56:37PM -0500, Eric Blake wrote: > Once ocamlfind is installed, 'make' failed for me with: > > ocamlfind ocamlc -g -annot -safe-string -warn-error CDEFLMPSUVYZX+52-3 -ccopt '-gdwarf' -package unix -c NBD.ml -o NBD.cmo > File "NBD.ml", line 1: > Error: Could not find the .cmi file for interface NBD.mli. > make[2]: ***

Covert common_utils_tests to use oUnit as testing framework, replacing the hand-made assert in favour of structured unit tests and better error reporting. common_utils_tests is now built only when the oUnit module has been found. --- mllib/Makefile.am | 17 ++++- mllib/common_utils_tests.ml | 155 +++++++++++++++++++++++++++----------------- 2 files changed, 108 insertions(+), 64

Use the newer copy shipped locally as 3rdparty, instead of the one in the common submodule, as the latter copy will go away soon. --- .gitignore | 2 ++ Makefile.am | 2 +- configure.ac | 2 +- test-harness/Makefile.am | 2 +- v2v/Makefile.am | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index

This is a first attempt to build libguestfs with just a ocaml bytecode compiler. The three tools written in ocaml will be build only when an ocamlopt compiler is available. Olaf --- Makefile.am | 5 ++++- configure.ac | 2 ++ ocaml/Makefile.am | 20 +++++++++++++++++--- resize/Makefile.am | 2 +- sparsify/Makefile.am | 2 +- sysprep/Makefile.am | 2 +- 6

Previously the OCaml compiler was only required if building from git but was at least theoretically optional if building from tarballs (although this was never tested). Since we want to write parts of the daemon in OCaml, this makes OCaml required for all builds. Note that the ‘--disable-ocaml’ option remains, but it now only disables OCaml bindings and OCaml virt tools. Using this option does

On Mon, Dec 16, 2019 at 03:58:29PM +0100, Pino Toscano wrote: > Use the newer copy shipped locally as 3rdparty, instead of the one in > the common submodule, as the latter copy will go away soon. > --- > .gitignore | 2 ++ > Makefile.am | 2 +- > configure.ac | 2 +- > test-harness/Makefile.am | 2 +- > v2v/Makefile.am | 4

Create a module ‘C_utils’ containing functions like ‘drive_name’ and ‘shell_unquote’ which come from the C utilities. The new directory ‘common/mlutils’ also contains the ‘Unix_utils’ wrappers around POSIX functions missing from the OCaml stdlib. --- .gitignore | 3 + Makefile.am | 24 ++--- builder/Makefile.am

Even if ocamlopt is available, always build a bytecode version of ‘common/mlstdutils’. Furthermore, because this library is pure OCaml, we should not be using ‘ocamlmklib’. We should use ‘ocaml{c,opt} -a’ instead. This doesn't make any difference for native code, but for bytecode it was building a broken library. The original reason for making this change is because the generator is always

Even if ocamlopt is available, always build a bytecode version of ‘common/mlstdutils’. Furthermore, because this library is pure OCaml, we should not be using ‘ocamlmklib’. We should use ‘ocaml{c,opt} -a’ instead. This doesn't make any difference for native code, but for bytecode it was building a broken library. The original reason for making this change is because the generator is always

Extract the guest kernel/ramdisk extraction from virt-builder into a separate utility, so it can be used and improved without cluttering virt-builder. Currently it does what virt-builder --get-kernel did, adding also the options for remote disks and libvirt access, much like other libguestfs tools. virt-builder --get-kernel now just spawns virt-get-kernel. --- .gitignore |