summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-04-05 10:29:39 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2013-04-05 08:18:12 -0700
commitaef07c424d67f64de6f3a4efa127c6dfc1645c97 (patch)
treefb6af53b282a831da777221cbff6f57af7f4fe87
parente8b062e8f34f6c228566ca4d33a8c6100db2d168 (diff)
downloadmeta-virtualization-aef07c424d67f64de6f3a4efa127c6dfc1645c97.tar.gz
libvirt: add dtrace pkgconfig option
If the host machine has dtrace, or systemtap development libraries installed, libvirt will detect their headers and enable dtrace probe support. But since we don't have a dependency on dtrace, the build will fail with: | compilation terminated. | In file included from ./internal.h:297:0, | from util/bitmap.h:27, | from util/bitmap.c:33: | ./libvirt_probes.h:9:21: fatal error: sys/sdt.h: No such file or directory There are three problems: - a host contamination issue - dtrace/probes being automatically enabled - a lack of integrated systemtap/dtrace solution Fixing any of the above will make the problem go away, to fix currently broken builds, we can fix the problem by adding dtrace as a PACKAGECONFIG option, and leaving it disabled. This change doesn't add a dtrace/systemtap dependency to the config entry, since they haven't been confirmed at this point. In the future, we should either fix the host contamination or do a full systemtap/dtrae integration, but for now, simply disabling it is the best choice. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--recipes-extended/libvirt/libvirt_1.0.3.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/recipes-extended/libvirt/libvirt_1.0.3.bb b/recipes-extended/libvirt/libvirt_1.0.3.bb
index 372e8743..bf8c9ec8 100644
--- a/recipes-extended/libvirt/libvirt_1.0.3.bb
+++ b/recipes-extended/libvirt/libvirt_1.0.3.bb
@@ -128,6 +128,7 @@ PACKAGECONFIG[remote] = "--with-remote,--without-remote"
128PACKAGECONFIG[macvtap] = "--with-macvtap=yes,--with-macvtap=no,libnl,libnl" 128PACKAGECONFIG[macvtap] = "--with-macvtap=yes,--with-macvtap=no,libnl,libnl"
129PACKAGECONFIG[libvirtd] = "--with-libvirtd,--without-libvirtd" 129PACKAGECONFIG[libvirtd] = "--with-libvirtd,--without-libvirtd"
130PACKAGECONFIG[netcf] = "--with-netcf,--without-netcf,netcf,netcf" 130PACKAGECONFIG[netcf] = "--with-netcf,--without-netcf,netcf,netcf"
131PACKAGECONFIG[dtrace] = "--with-dtrace,--without-dtrace,,"
131 132
132# Enable the Python tool support 133# Enable the Python tool support
133require libvirt-python.inc 134require libvirt-python.inc