similar to: [PATCH 1/3] out-of-tree build: daemon

I needed to add a few patches to be able to build libguestfs 1.20.2 out of tree. Mostly srcdir/builddir issues -- I think that I had posted something for building the daemon before. As mentioned on IRC, I found that compiling (Ruby bindings) caused config.h file shipped with the Ruby headers to be included rather than ${builddir}/config.h. This can be fixed because the relevant checks can be

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

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 change adds an explicit dependency on generator.ml for every file it generates, except java files. Java is left for another time because it's considerably trickier. This fixes parallel make, and will automatically re-create generated files when make is run from any directory. It also fixes the problem which efad4f53 was targetting. Specifically, src/guestfs_protocol.(c|h) had an

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

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

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

For convenience you can pull it from the 'build' branch in: git://heisenbug.com/matthew/libguestfs.git Matt

This patch series moves some files and directories around but is only code motion (or supposed to be). A new directory, common/, is created for all of the common code which is currently shared in random ways between parts of the project. And src/ becomes lib/ (the largest change, but mostly mechanical). In full this series makes the following changes: src/libprotocol -> common/protocol

Previous patch series was posted here: https://www.redhat.com/archives/libguestfs/2017-January/msg00059.html v2 simply extends this patch series to cover the extra directories common/edit, common/progress, common/windows and common/parallel. The only remaining item is to consider whether we should rename mllib to something else, mlcommon was my suggestion. Rich.

I am a Manjaro user and was compiling libguestfs today from the AUR (it doesn't reside on Arch/Manjaro repos) and got the following error: "make[2]: Leaving directory '/home/matador/AUR/libguestfs-git/src/libguestfs/common/errnostring' Making all in common/protocol make[2]: Entering directory '/home/matador/AUR/libguestfs-git/src/libguestfs/common/protocol' make[2]: ***

Without this option, configure will fail when there is no display. Signed-off-by: Masami HIRATA <msmhrt at gmail.com> --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index de8a064..61d6f69 100644 --- a/configure.ac +++ b/configure.ac @@ -593,16 +593,16 @@ working. AC_MSG_FAILURE([$QEMU version must be >=

v1 -> v2: - Use intprops macro suggested by danpb. Rich.

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

On Wednesday, 25 January 2017 14:37:10 CET Richard W.M. Jones wrote: > 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. > --- > guestfsd_SOURCES = \ > + ../common/errnostring/errnostring.h \ > +

Hello, I'm attempting to create a Homebrew formula to get libguestfs to compile on Mac OS X. I've managed to achieve success with several monkey patches, but since Homebrew's policy is to contact maintainers about proper fixes in upstream, I would like to ask if there are any plans to fix these issues. I'm afraid I don't know C well enough to propose decent solutions myself.

Use interfaces files (*.mli files) instead of exporting all symbols randomly. Change the 'file is generated' warnings at the top of generated files so they accurately describe which source file generates each output file. Rich.

Here's what I needed to build and run 1.20 on Debian/unstable. Perhaps the libcap2 dependency in the packagelist should only be added if libcap has actually been used in building guestfsd...

Move the generate_all_structs and generate_all_headers functions, previously internal within the implementation of generate_guestfs_h, to be usable by other functions in the same "C" module (but not public). Only code motion. --- generator/c.ml | 163 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 82 insertions(+), 81 deletions(-) diff --git a/generator/c.ml