[Libguestfs] [PATCH] Link .mli files corresponding to autorgenerated .ml files into builddir
Pino Toscano
ptoscano at redhat.com
Tue Jan 14 10:18:42 UTC 2020
On Tuesday, 14 January 2020 00:04:49 CET Hilko Bengen wrote:
> This avoids build failures in separate builds such as this one:
>
> ,----
> | ocamlfind ocamlc -package str,unix -I . -a guestfs_config.cmo stringMap.cmo stringSet.cmo std_utils.cmo -o mlstdutils.cma
> | ar cr libmlstdutils.a libmlstdutils_a-dummy.o
> | ranlib libmlstdutils.a
> | File "_none_", line 1:
> | Error: Files std_utils.cmo and guestfs_config.cmo
> | make inconsistent assumptions over interface Guestfs_config
> | make[4]: *** [Makefile:2580: mlstdutils.cma] Error 2
> `----
> ---
> configure.ac | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/configure.ac b/configure.ac
> index 5f8310a640..77a1e986cd 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -353,6 +353,10 @@ AC_CONFIG_FILES([Makefile
> tools/Makefile
> website/index.html])
>
> +AC_CONFIG_LINKS([common/mlstdutils/guestfs_config.mli:common/mlstdutils/guestfs_config.mli
> + daemon/daemon_config.mli:daemon/daemon_config.mli
> + v2v/config.mli:v2v/config.mli])
> +
> AC_OUTPUT
I do not think this is the correct approach. See my analysis here:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=946594#46
The fixes for this were done upstream recently, see for libguestfs:
https://github.com/libguestfs/libguestfs/commit/323909d92ee681091f15ec2cd9fa1b6bc6379146
https://github.com/libguestfs/libguestfs/commit/4cd801dcff1393f6ffcb81cac9a6dcdb1f007bd2
https://github.com/libguestfs/libguestfs-common/commit/3728b95b880601af95ab2b6b7f1d8110fb5e1fa8
https://github.com/libguestfs/virt-v2v/commit/0e63bae4e84fd2a9752dbf5fa32fcb90631806e3
Plus there were more builddir!=srcdir fixes.
--
Pino Toscano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL: <http://listman.redhat.com/archives/libguestfs/attachments/20200114/c6e6ba35/attachment.sig>
More information about the Libguestfs
mailing list