[libvirt] [PATCH] build: fix race in vapi/ subdirectory
libvirt-gobject-1.0.vapi depends on libvirt-gconfig-1.0.vapi --- vapi/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vapi/Makefile.am b/vapi/Makefile.am index 0154104..af10e98 100644 --- a/vapi/Makefile.am +++ b/vapi/Makefile.am @@ -17,7 +17,7 @@ libvirt-glib-1.0.vapi: $(top_builddir)/libvirt-glib/LibvirtGLib-1.0.gir --library libvirt-glib-1.0 \ $< -libvirt-gobject-1.0.vapi: $(top_builddir)/libvirt-gobject/LibvirtGObject-1.0.gir libvirt-glib-1.0.vapi +libvirt-gobject-1.0.vapi: $(top_builddir)/libvirt-gobject/LibvirtGObject-1.0.gir libvirt-glib-1.0.vapi libvirt-gconfig-1.0.vapi $(AM_V_GEN)$(VAPIGEN) \ --vapidir=$(builddir) \ --pkg gobject-2.0 \ -- 1.9.3
[adding "glib" to subject line to possibly trigger some mail filters...] On 06/02/2014 10:52 AM, Michael Catanzaro wrote:
libvirt-gobject-1.0.vapi depends on libvirt-gconfig-1.0.vapi --- vapi/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vapi/Makefile.am b/vapi/Makefile.am index 0154104..af10e98 100644 --- a/vapi/Makefile.am +++ b/vapi/Makefile.am @@ -17,7 +17,7 @@ libvirt-glib-1.0.vapi: $(top_builddir)/libvirt-glib/LibvirtGLib-1.0.gir --library libvirt-glib-1.0 \ $<
-libvirt-gobject-1.0.vapi: $(top_builddir)/libvirt-gobject/LibvirtGObject-1.0.gir libvirt-glib-1.0.vapi +libvirt-gobject-1.0.vapi: $(top_builddir)/libvirt-gobject/LibvirtGObject-1.0.gir libvirt-glib-1.0.vapi libvirt-gconfig-1.0.vapi
This hit the list with line-wrapping , making it a bit harder to tell what changed. It's okay to use: libvirt-gobject-1.0.vapi: \ dep1 dep2 \ dep3 instead of cramming it on one line longer than 80 columns, if that makes it more legible. I'm not a regular libvirt-glib contributor, so I won't push it, but the change (adding libvirt-gconfig-1.0.vapi as an additional dependency) makes sense on the surface. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On Mon, 2014-06-02 at 16:12 -0600, Eric Blake wrote:
This hit the list with line-wrapping , making it a bit harder to tell what changed.
Sorry, patch attached to avoid line wrapping. I wonder if the libvirt-gconfig-1.0.vapi dependency should actually REPLACE the one on libvirt-glib-1.0.vapi, but I haven't checked.
On Mon, Jun 02, 2014 at 05:23:00PM -0500, Michael Catanzaro wrote:
On Mon, 2014-06-02 at 16:12 -0600, Eric Blake wrote:
This hit the list with line-wrapping , making it a bit harder to tell what changed.
Sorry, patch attached to avoid line wrapping.
I have pushed this patch Christophe
On Mon, Jun 02, 2014 at 11:52:27AM -0500, Michael Catanzaro wrote:
libvirt-gobject-1.0.vapi depends on libvirt-gconfig-1.0.vapi
Does it need libvirt-gconfig.vapi, or libvirt-gconfig.gir? The only reference to libvirt-gconfig in this Makefile rule is --girdir=$(top_builddir)/libvirt-gconfig Christophe
On Tue, 2014-06-03 at 09:26 +0200, Christophe Fergeau wrote:
Does it need libvirt-gconfig.vapi, or libvirt-gconfig.gir? The only reference to libvirt-gconfig in this Makefile rule is --girdir=$(top_builddir)/libvirt-gconfig
It needs to be the vapi: libvirt-gconfig-1.0.vapi is a dep of libvirt-gobject-1.0.vapi according to the .deps file. (But libvirt-glib-1.0.vapi is not.) The gir is guaranteed to be generated before we enter this directory. Michael
On Tue, Jun 03, 2014 at 07:05:45AM -0500, Michael Catanzaro wrote:
On Tue, 2014-06-03 at 09:26 +0200, Christophe Fergeau wrote:
Does it need libvirt-gconfig.vapi, or libvirt-gconfig.gir? The only reference to libvirt-gconfig in this Makefile rule is --girdir=$(top_builddir)/libvirt-gconfig
It needs to be the vapi: libvirt-gconfig-1.0.vapi is a dep of libvirt-gobject-1.0.vapi according to the .deps file. (But libvirt-glib-1.0.vapi is not.)
Ah I missed the .deps file, and vapigen indeed files if libvirt-gconfig-1.0.vapi is not present when it's listed in the .deps file, ACK. Christophe
participants (3)
-
Christophe Fergeau -
Eric Blake -
Michael Catanzaro