[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH] daemon: exclude requirement for probes.h on systems without systemtap



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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]