diff --git a/common/shlibs b/common/shlibs index 8ed26df7211..10e5cabcf5e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2455,6 +2455,7 @@ libbabeltrace-ctf-text.so.1 babeltrace-1.5.3_1 libbabeltrace-ctf-metadata.so.1 babeltrace-1.5.3_1 libbabeltrace-dummy.so.1 babeltrace-1.5.3_1 libbabeltrace-lttng-live.so.1 babeltrace-1.5.3_1 +liblttng-ctl.so.0 lttng-tools-2.10.1_1 libKF5DNSSD.so.5 kdnssd-5.26.0_1 libtwaindsm.so.2 twaindsm-2.3.0_1 libspnav.so.0 libspnav-0.2.3_1 diff --git a/srcpkgs/lttng-tools-devel b/srcpkgs/lttng-tools-devel new file mode 120000 index 00000000000..e5e58efd61b --- /dev/null +++ b/srcpkgs/lttng-tools-devel @@ -0,0 +1 @@ +lttng-tools \ No newline at end of file diff --git a/srcpkgs/lttng-tools/patches/musl.patch b/srcpkgs/lttng-tools/patches/musl.patch new file mode 100644 index 00000000000..752696581fe --- /dev/null +++ b/srcpkgs/lttng-tools/patches/musl.patch @@ -0,0 +1,33 @@ +--- src/common/pipe.h 2017-08-03 21:42:22.098586810 +0200 ++++ src/common/pipe.h 2017-12-16 20:27:26.546173345 +0100 +@@ -18,6 +18,7 @@ + #ifndef LTTNG_PIPE_H + #define LTTNG_PIPE_H + ++#include + #include + #include + +--- tests/regression/ust/ust-dl/prog.c 2017-08-03 21:42:22.130585910 +0200 ++++ tests/regression/ust/ust-dl/prog.c 2017-12-16 20:33:52.906200900 +0100 +@@ -13,6 +13,10 @@ + */ + int main(int argc, char **argv) + { ++/* ++ * Note: musl libc does not support dlmopen(3) so make this fail ++ */ ++#if defined(__GLIBC__) + void *h0, *h1, *h2, *h3, *h4; + char *error; + int (*foo)(void); +@@ -67,6 +71,9 @@ + get_error: + error = dlerror(); + error: ++#else /* defined(__GLIBC__) */ ++ const char* error = "dlmopen(3) not supported"; ++#endif /* defined(__GLIBC__) */ + fprintf(stderr, "%s\n", error); + exit(EXIT_FAILURE); + } diff --git a/srcpkgs/lttng-tools/template b/srcpkgs/lttng-tools/template new file mode 100644 index 00000000000..2eb93b90db1 --- /dev/null +++ b/srcpkgs/lttng-tools/template @@ -0,0 +1,26 @@ +# template file for 'lttng-tools' +pkgname=lttng-tools +version=2.10.1 +revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="popt-devel libxml2-devel libuuid-devel liburcu-devel lttng-ust-devel + babeltrace-devel lttng-modules-dkms" +system_groups="tracing" +short_desc="A set of tools to control LTTng tracing" +maintainer="Alexander Egorenkov " +license="LGPL-2.1" +homepage="http://lttng.org" +distfiles="${homepage}/files/${pkgname}/${pkgname}-${version}.tar.bz2" +checksum=20bc4b7ad297c0181f20f8cf3ba2967ded76d5628a05b8c7817d39a928edaa00 + +lttng-tools-devel_package() { + short_desc+=" - development files" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/lib/*.so + vmove usr/lib/*.a + } +}