diff options
| author |   Ross Burton <ross.burton@intel.com> | 2016-10-04 16:37:53 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-05 00:10:04 +0100 |
| commit | fb9dc1cf7a2d6d5e22beb68f17b4c9c8d1136e37 (patch) | |
| tree | 7d32bed66c9d1647370b56c6c7494de034b570ca /meta/recipes-kernel/systemtap/systemtap_git.bb | |
| parent | c2c053a016d9c146e46fc617cdbd9e8b34ea955f (diff) | |
| download | openembedded-core-contrib-fb9dc1cf7a2d6d5e22beb68f17b4c9c8d1136e37.tar.gz | |
systemtap: rationalise dependencies
Boost is an optional dependency but avoid build non-determinism by adding it as
DEPENDS. It is only for the shared pointer types so can be disabled explicitly
if required.
Turn sqlite into a PACKAGECONFIG.
Add a patch for the "monitor" feature to control the optional dependencies on
ncurses and json-c. Previously this was enabled for target only but enable it
everwhere now that json-c is available for native/nativesdk.
Of course all of this was predicated about systemtap needing systemtap-native to
be built, but it turns out that this dependency is due to oe-core 507bd2 which
adds systemtap-native as DEPENDS for convenience. Remove this dependency, if
the user wants systemtap-native then they can build it explicitly.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/systemtap/systemtap_git.bb')
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index da30fa5e6d..43bf69e877 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -2,9 +2,7 @@ SUMMARY = "Script-directed dynamic tracing and performance analysis tool for Lin require systemtap_git.inc -DEPENDS = "elfutils sqlite3 systemtap-native ncurses json-c" -DEPENDS_class-native = "elfutils-native sqlite3-native gettext-native" -DEPENDS_class-nativesdk = "nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettext" +DEPENDS = "boost elfutils" RDEPENDS_${PN} += "python3-core bash" @@ -19,8 +17,10 @@ STAP_DOCS ?= "--disable-docs --disable-publican --disable-refdocs" EXTRA_OECONF += "${STAP_DOCS} " -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "sqlite monitor" PACKAGECONFIG[libvirt] = "--enable-libvirt,--disable-libvirt,libvirt" +PACKAGECONFIG[sqlite] = "--enable-sqlite,--disable-sqlite,sqlite3" +PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor,ncurses json-c" inherit autotools gettext pkgconfig |