similar to: [PATCH] Fix dependencies on generator.ml

This new series condenses all of the previously posted patches into new patch 1/2. The second patch is a new fix for parallel build in the haskell directory.

Patch 1/5 is a repost. Only change is title update. These fix parallel make on my machine, and additionally make building from subdirectories more correct.

This commit, which is just code motion, moves the common XDR protocol code (libprotocol) and the common errno handling (liberrnostring) into libraries which are each built once and shared between the library and daemon. --- .gitignore | 20 +++++-------- Makefile.am | 1 + common/errnostring/Makefile.am | 45 +++++++++++++++++++++++++++++

>From 9e99a1c6cb655a56d7f09dabd10a77a3802bf96d Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering at redhat.com> Date: Mon, 17 Aug 2009 18:44:37 +0200 Subject: [PATCH libguestfs 1/2] avoid compiler warnings about unused vars in generated code * src/Makefile.am: Compile protocol.c into a convenience library, so it can have its own CFLAGS, and link that with the destination one. ---

--- daemon/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index e23ce86..af075d7 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -42,10 +42,10 @@ noinst_LIBRARIES = libprotocol.a libprotocol_a_SOURCES = guestfs_protocol.c guestfs_protocol.h libprotocol_a_CFLAGS = -Wall -Wno-unused -fno-strict-aliasing

Parallel make was failing because guestfs-structs.h was required before generator.ml ran. --- src/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 469f6d6..ae10ed8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,8 +34,6 @@ stamp-generator: generator.ml mkdir -p $(top_srcdir)/java/com/redhat/et/libguestfs

By adding common CLEANFILES and DISTCLEANFILES variables to common-rules.mk, we can remove these from most other Makefiles, and also clean files more consistently. Note that bin_PROGRAMS are already cleaned by 'make clean', so I removed cases where these were unnecessarily added to CLEANFILES. --- .gitignore | 1 + Makefile.am | 6

When I build with LC_ALL=C in my environment, the all-local rule generates po/POTFILES.in that is sorted differently from the on that is checked in: diff --git a/po/POTFILES.in b/po/POTFILES.in index ca01b3d..154915a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -63,12 +63,11 @@ fish/tilde.c fish/time.c inspector/virt-inspector.pl

I haven't received this yet, but read from the archive: https://www.redhat.com/archives/libguestfs/2009-November/msg00268.html The only suspicious part is the trailing ".c" on the command below: +$(libsrcdir)/guestfs_protocol.c: force + $(MAKE) -C $(libsrcdir) guestfs_protocol.c +$(libsrcdir)/guestfs_protocol.h: force + $(MAKE) -C $(libsrcdir) guestfs_protocol.c Shouldn't

Recently we changed the daemon so it builds guestfs_protocol.o by this rule: $(libsrcdir)/guestfs_protocol.o: force $(MAKE) -C $(libsrcdir) guestfs_protocol.o guestfsd_LDADD = \ $(libsrcdir)/guestfs_protocol.o \ #... The problem with doing this when building on Windows is that the toplevel src/ directory will be configured differently from the daemon/ directory. This means that

Since some modules (`getopt', for example) may copy files into the build directory, `top_builddir/lib' is needed as well as `top_srcdir/lib'. -- GNU Gnulib manual, section 2.2 Initial import --- capitests/Makefile.am | 1 + daemon/Makefile.am | 2 +- src/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/capitests/Makefile.am

Very similar to the one for protocol.c... >From b5896dfb673a6f8dfd536ae86a6ea3d2925d2af5 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering at redhat.com> Date: Tue, 18 Aug 2009 10:15:57 +0200 Subject: [PATCH libguestfs] avoid compiler warnings about unused vars in generated code * fish/Makefile.am: Compile rc_protocol.c into a convenience library, so it can have its own CFLAGS, and

Here are four small patches. First, I enabled all the warnings, then I fixed the newly exposed offenses, then I put the warning-enabling patch at the end, for the sake of future bisectors: [1/4] ocaml/guestfs_c.c avoid signed/unsigned-comparison warning [2/4] ocaml/guestfs_c.c: avoid warning about initialization discarding "const" [3/4] ocaml/guestfs_c.c: avoid warning about missing

glibc in Fedora is currently configured with `--enable-obsolete-rpc', so I guess we can see the way the wind is blowing. (1) This changes our configure script to prefer libtirpc if it is available. If libtirpc is _not_ available then: (a) Headers must be located in <rpc/xdr.h>, or the user must supply the right CFLAGS. (b) XDR functions must be located in one of -lportablexdr, -lrpc,

On Mon, Jul 06, 2020 at 07:52:42PM -0300, Ezequiel Santos wrote: > Actually, I was trying to compile it from the AUR repository ( > https://aur.archlinux.org/packages/libguestfs-git/) when I came across this > problem. > Now, answering your question: > *1. Are there any files under common/ ?* > Yes. There are several files there in, including Makefile.am, > guestfs_protocol.x,

These won't be used by the daemon, so interferes with us using common/utils in the daemon, so they are moved to a different library. --- .gitignore | 8 +++--- Makefile.am | 4 ++- align/Makefile.am | 2 ++ align/scan.c | 1 + cat/Makefile.am | 10 ++++++++

Without this change all the tests in the haskell bindings are rebuilt every time. The primary motivation for this change is to fix this. The fix for the above also allows parallel builds to be re-enabled. --- haskell/Makefile.am | 56 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/haskell/Makefile.am b/haskell/Makefile.am

Just code motion. This commit makes it clearer what is a utility and what is part of the library. It also makes it clear that we should rename: guestfs-internal-frontend.h -> utils.h guestfs-internal-frontend-cleanups.h -> cleanups.h (?) but this commit does not make that change. --- .gitignore | 10 ++--- Makefile.am

--- fish/Makefile.am | 2 +- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fish/Makefile.am b/fish/Makefile.am index 6ca8a82..16a29b0 100644 --- a/fish/Makefile.am +++ b/fish/Makefile.am @@ -139,7 +139,7 @@ if HAVE_RPCGEN rc_protocol.c: rc_protocol.x rm -f $@-t $@-t2 $(RPCGEN) -c -o $@-t $< - sed 's,\.\./\.\./fish/,,' < $@-t >

Since glibc-2.26 removed the /usr/include/rpc/rpc.h, it caused problem even though probing for libtirpc has taken place and worked properly. The problem is that RPC_CFLAGS (usually `-I/usr/include/tirpc` on Linux) was not used in places where it was needed. So the build failed with messages like the following: In file included from guestfs_protocol.c:6:0: guestfs_protocol.h:9:10: fatal error: