[libvirt] [PATCH] daemon: exclude requirement for probes.h on systems without systemtap
This 1-liner was actually written by Eric Blake, over IRC. It addresses a compilation failure in make dist and make rpm for systems without the dtrace/systemtap development libraries installed. --- daemon/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 0e254d4..d1ffd97 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -168,7 +168,7 @@ EXTRA_DIST += probes.d libvirtd.stp if WITH_DTRACE libvirtd_LDADD += probes.o -libvirtd_SOURCES += probes.h +libvirtd_nodist_SOURCES = probes.h BUILT_SOURCES += probes.h -- 1.7.2.3
On 10/22/2010 02:57 PM, Justin Clift wrote:
This 1-liner was actually written by Eric Blake, over IRC. It addresses a compilation failure in make dist and make rpm for systems without the dtrace/systemtap development libraries installed. --- daemon/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 0e254d4..d1ffd97 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -168,7 +168,7 @@ EXTRA_DIST += probes.d libvirtd.stp
if WITH_DTRACE libvirtd_LDADD += probes.o -libvirtd_SOURCES += probes.h +libvirtd_nodist_SOURCES = probes.h
Given your testing of my one-liner IRC comment: ACK. For more explanation for those not following IRC - probes.h is a generated file, but it can only be generated if you are using dtrace (systemtap-sdt-devel on Fedora). On the other hand, lack of probes.h does not affect compilation for people not using dtrace. Unlike documentation, where we want it to be available even if the user can't regenerate it, we know that probes.h is safe to omit from the distribution tarball since the only people using dtrace already have the tools to regenerate it. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
On 10/22/2010 03:05 PM, Eric Blake wrote:
On 10/22/2010 02:57 PM, Justin Clift wrote:
This 1-liner was actually written by Eric Blake, over IRC. It addresses a compilation failure in make dist and make rpm for systems without the dtrace/systemtap development libraries installed. --- daemon/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 0e254d4..d1ffd97 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -168,7 +168,7 @@ EXTRA_DIST += probes.d libvirtd.stp
if WITH_DTRACE libvirtd_LDADD += probes.o -libvirtd_SOURCES += probes.h +libvirtd_nodist_SOURCES = probes.h
Given your testing of my one-liner IRC comment:
ACK.
Actually, the automake manual says this needs to be nodist_libvirtd_SOURCES (sorry I didn't check the manual before ACK'ing; and I'm assuming you tested without dtrace). -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
On 10/23/2010 08:52 AM, Eric Blake wrote: <snip>
Given your testing of my one-liner IRC comment:
ACK.
Actually, the automake manual says this needs to be nodist_libvirtd_SOURCES (sorry I didn't check the manual before ACK'ing; and I'm assuming you tested without dtrace).
Just pushed the corrected fix. Weirdly, it worked previously on my system. :/
participants (2)
-
Eric Blake -
Justin Clift