| Message ID | 20161030195649.6415-6-eeppeliteloop@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
Philippe, All, On 2016-10-30 15:56 -0400, Philippe Proulx spake thusly: > Current patches are dropped because they were merged upstream. > > Official Babeltrace's website changed from > <http://www.efficios.com/babeltrace> to <http://diamon.org/babeltrace>. > > Official upstream site of Babeltrace for the distribution of tarballs > changed from lttng.org to efficios.com (see > <http://diamon.org/babeltrace>). Also, the package has changed name from "lttng-babeltrace" to just "babeltrace". Maybe we could reflect this change in Buildroot as well? If so, do not forget to add an entry in Config.in.legacy. > I'm removing the host package build, as users can get Babeltrace on > major Linux distributions using their package manager. This should be a separate patch (but see my other comment in my previous reply to patch 3/5). > Since Babeltrace 1.4, there is support for printing debug information > along with compatible traces and event records. Babeltrace needs > elfutils in this case. If elfutils exists in the BR image, then this > feature is enabled. So, we discussed this with Philippe on IRC, but elfutils is not always available. It needs glibc or uClibc, and is not availa for musl. Also, it needs shared libs and wchar. However, lttng-babeltrace by itself does not have all of those requirements, so Philippe was wondering how to inform the user that debugging info would not be available in those cases. I think adding a kconfig comment in that case is appropriate (see below). > Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com> [--SNIP--] > diff --git a/package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch b/package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch > new file mode 100644 > index 0000000..831a04c > --- /dev/null > +++ b/package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch > @@ -0,0 +1,30 @@ > +From d3cce60dfde30bd2fd67caa3fbc5f111131c243a Mon Sep 17 00:00:00 2001 > +From: Philippe Proulx <eeppeliteloop@gmail.com> > +Date: Fri, 28 Oct 2016 01:48:25 -0400 > +Subject: [PATCH] configure.ac: remove elfutils version test for Buildroot > + > +The AX_LIB_ELFUTILS macro builds an executable file and executes it to > +discover the version of elfutils. Obviously we cannot execute a > +cross-compiled program here, hence this test is removed because we know > +that elfutils's version is greater than 0.154 anyway in Buildroot. It's a pity we can't feed it with the result, with one of the ac_cv_* cache variables. :-( Maybe you could push such a feature upstream, so we can use it at the next release? [--SNIP--] > diff --git a/package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch b/package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch > new file mode 100644 > index 0000000..641835c > --- /dev/null > +++ b/package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch > @@ -0,0 +1,36 @@ > +From 27e37d2621317d25e08ba0683bf8540b05b9347d Mon Sep 17 00:00:00 2001 > +From: Philippe Proulx <eeppeliteloop@gmail.com> > +Date: Fri, 28 Oct 2016 02:09:20 -0400 > +Subject: [PATCH] tests/lib/Makefile.am: remove unneeded -static flag > + > +Having those -static flags breaks the build in shared-only builds. > + > +Upstream does not even know why those flags are passed here, and they > +are about to remove them as of this date. Please, add a pointer to the upstream discussion about those flags. > diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in > index d362779..8aafc6d 100644 > --- a/package/lttng-babeltrace/Config.in > +++ b/package/lttng-babeltrace/Config.in > @@ -14,18 +14,19 @@ config BR2_PACKAGE_LTTNG_BABELTRACE > to/from another trace format. > > Babeltrace is the reference implementation of the Common > - Trace Format (see <http://diamon.org/docs/ctf/>). Babeltrace > + Trace Format (see <http://diamon.org/ctf/>). Babeltrace > can decode and display LTTng traces, since the latter are > written using the CTF format. > > + The babeltrace utility is built with debug information > + printing support when the elfutils package is selected. Drop this sentence, but add a config option for it: if BR2_PACKAGE_LTTNG_BABELTRACE config BR2_PACKAGE_LTTNG_BABELTRACE_DEBUG_INFO bool default y depends on !BR2_bfin # elfutils depends on !BR2_STATIC_LIBS # elfutils depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils select BR2_PACKAGE_ELFUTILS comment "handling debug info in traces needs a glibc or uClibc toolchain w/ dynamic library" depends on !BR2_bfin # elfutils depends on BR2_STATIC_LIBS \ || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) endif Then, in the .mk, see below... > Having this tool on the target is not mandatory. You can > transfer the binary trace output from the target to your > - development workstation, and use babeltrace here. Buildroot > - automatically builds a host babeltrace in > - $(O)/host/usr/bin/babeltrace as a dependency of the > - lttng-tools package. > + development workstation, and use babeltrace here. Babeltrace > + is packaged for all major Linux distributions. To be adapted if you make it a host-package in the "Host utilities" sub-menu (which I'd like you do, pretty please! ;-) ). [--SNIP--] > diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk > index b2e03a9..ced1024 100644 > --- a/package/lttng-babeltrace/lttng-babeltrace.mk > +++ b/package/lttng-babeltrace/lttng-babeltrace.mk > @@ -4,18 +4,21 @@ > # > ################################################################################ > > -LTTNG_BABELTRACE_SITE = http://lttng.org/files/babeltrace > -LTTNG_BABELTRACE_VERSION = 1.2.4 > +LTTNG_BABELTRACE_SITE = http://www.efficios.com/files/babeltrace > +LTTNG_BABELTRACE_VERSION = 1.4.0 > LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2 > LTTNG_BABELTRACE_LICENSE = MIT, LGPLv2.1 (include/babeltrace/list.h), GPLv2 (test code) > LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE > - > LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2 host-pkgconf > -HOST_LTTNG_BABELTRACE_DEPENDENCIES = \ > - host-popt host-util-linux host-libglib2 host-pkgconf > > -# for 0002-configure-fix-uuid-support-detection-on-static-build.patch > +# For 0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch > LTTNG_BABELTRACE_AUTORECONF = YES > > +ifeq ($(BR2_PACKAGE_ELFUTILS),y) Here, use: ifeq ($(BR2_PACKAGE_LTTNG_BABELTRACE_DEBUG_INFO),y) > +LTTNG_BABELTRACE_DEPENDENCIES += elfutils > +LTTNG_BABELTRACE_CONF_OPTS += --enable-debug-info > +else > +LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info > +endif > + > $(eval $(autotools-package)) > -$(eval $(host-autotools-package)) Regards, Yann E. MORIN.
On Sun, Oct 30, 2016 at 6:06 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote: > Philippe, All, > > On 2016-10-30 15:56 -0400, Philippe Proulx spake thusly: >> Current patches are dropped because they were merged upstream. >> >> Official Babeltrace's website changed from >> <http://www.efficios.com/babeltrace> to <http://diamon.org/babeltrace>. >> >> Official upstream site of Babeltrace for the distribution of tarballs >> changed from lttng.org to efficios.com (see >> <http://diamon.org/babeltrace>). > > Also, the package has changed name from "lttng-babeltrace" to just > "babeltrace". Maybe we could reflect this change in Buildroot as well? > > If so, do not forget to add an entry in Config.in.legacy. I remember trying to do this once, and you guys nacked me because "there always has been pushback from Peter against gratuitous renaming". My patch did not include an entry in `Config.in.legacy`, however. If you're willing, I can rename it in another patch after bumping to v1.4.0. > >> I'm removing the host package build, as users can get Babeltrace on >> major Linux distributions using their package manager. > > This should be a separate patch (but see my other comment in my previous > reply to patch 3/5). > >> Since Babeltrace 1.4, there is support for printing debug information >> along with compatible traces and event records. Babeltrace needs >> elfutils in this case. If elfutils exists in the BR image, then this >> feature is enabled. > > So, we discussed this with Philippe on IRC, but elfutils is not always > available. It needs glibc or uClibc, and is not availa for musl. Also, > it needs shared libs and wchar. > > However, lttng-babeltrace by itself does not have all of those > requirements, so Philippe was wondering how to inform the user that > debugging info would not be available in those cases. > > I think adding a kconfig comment in that case is appropriate (see > below). > >> Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com> > [--SNIP--] >> diff --git a/package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch b/package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch >> new file mode 100644 >> index 0000000..831a04c >> --- /dev/null >> +++ b/package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch >> @@ -0,0 +1,30 @@ >> +From d3cce60dfde30bd2fd67caa3fbc5f111131c243a Mon Sep 17 00:00:00 2001 >> +From: Philippe Proulx <eeppeliteloop@gmail.com> >> +Date: Fri, 28 Oct 2016 01:48:25 -0400 >> +Subject: [PATCH] configure.ac: remove elfutils version test for Buildroot >> + >> +The AX_LIB_ELFUTILS macro builds an executable file and executes it to >> +discover the version of elfutils. Obviously we cannot execute a >> +cross-compiled program here, hence this test is removed because we know >> +that elfutils's version is greater than 0.154 anyway in Buildroot. > > It's a pity we can't feed it with the result, with one of the ac_cv_* > cache variables. :-( Yes it scks. > > Maybe you could push such a feature upstream, so we can use it at the > next release? I will. I'll make sure the next BR release does not need to patch any of the LTTng/Babeltrace projects. > > [--SNIP--] >> diff --git a/package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch b/package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch >> new file mode 100644 >> index 0000000..641835c >> --- /dev/null >> +++ b/package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch >> @@ -0,0 +1,36 @@ >> +From 27e37d2621317d25e08ba0683bf8540b05b9347d Mon Sep 17 00:00:00 2001 >> +From: Philippe Proulx <eeppeliteloop@gmail.com> >> +Date: Fri, 28 Oct 2016 02:09:20 -0400 >> +Subject: [PATCH] tests/lib/Makefile.am: remove unneeded -static flag >> + >> +Having those -static flags breaks the build in shared-only builds. >> + >> +Upstream does not even know why those flags are passed here, and they >> +are about to remove them as of this date. > > Please, add a pointer to the upstream discussion about those flags. It happened on IRC but I will create a PR and point to it. > >> diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in >> index d362779..8aafc6d 100644 >> --- a/package/lttng-babeltrace/Config.in >> +++ b/package/lttng-babeltrace/Config.in >> @@ -14,18 +14,19 @@ config BR2_PACKAGE_LTTNG_BABELTRACE >> to/from another trace format. >> >> Babeltrace is the reference implementation of the Common >> - Trace Format (see <http://diamon.org/docs/ctf/>). Babeltrace >> + Trace Format (see <http://diamon.org/ctf/>). Babeltrace >> can decode and display LTTng traces, since the latter are >> written using the CTF format. >> >> + The babeltrace utility is built with debug information >> + printing support when the elfutils package is selected. > > Drop this sentence, but add a config option for it: > > if BR2_PACKAGE_LTTNG_BABELTRACE > > config BR2_PACKAGE_LTTNG_BABELTRACE_DEBUG_INFO > bool > default y > depends on !BR2_bfin # elfutils > depends on !BR2_STATIC_LIBS # elfutils > depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils How are we supposed to track the dependencies of elfutils in all the projects that need it? Copying the `depends` lines like this seems precarious. > select BR2_PACKAGE_ELFUTILS > > comment "handling debug info in traces needs a glibc or uClibc toolchain w/ dynamic library" > depends on !BR2_bfin # elfutils > depends on BR2_STATIC_LIBS \ > || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) > > endif > > Then, in the .mk, see below... > >> Having this tool on the target is not mandatory. You can >> transfer the binary trace output from the target to your >> - development workstation, and use babeltrace here. Buildroot >> - automatically builds a host babeltrace in >> - $(O)/host/usr/bin/babeltrace as a dependency of the >> - lttng-tools package. >> + development workstation, and use babeltrace here. Babeltrace >> + is packaged for all major Linux distributions. > > To be adapted if you make it a host-package in the "Host utilities" > sub-menu (which I'd like you do, pretty please! ;-) ). Will do. > > [--SNIP--] >> diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk >> index b2e03a9..ced1024 100644 >> --- a/package/lttng-babeltrace/lttng-babeltrace.mk >> +++ b/package/lttng-babeltrace/lttng-babeltrace.mk >> @@ -4,18 +4,21 @@ >> # >> ################################################################################ >> >> -LTTNG_BABELTRACE_SITE = http://lttng.org/files/babeltrace >> -LTTNG_BABELTRACE_VERSION = 1.2.4 >> +LTTNG_BABELTRACE_SITE = http://www.efficios.com/files/babeltrace >> +LTTNG_BABELTRACE_VERSION = 1.4.0 >> LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2 >> LTTNG_BABELTRACE_LICENSE = MIT, LGPLv2.1 (include/babeltrace/list.h), GPLv2 (test code) >> LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE >> - >> LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2 host-pkgconf >> -HOST_LTTNG_BABELTRACE_DEPENDENCIES = \ >> - host-popt host-util-linux host-libglib2 host-pkgconf >> >> -# for 0002-configure-fix-uuid-support-detection-on-static-build.patch >> +# For 0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch >> LTTNG_BABELTRACE_AUTORECONF = YES >> >> +ifeq ($(BR2_PACKAGE_ELFUTILS),y) > > Here, use: > > ifeq ($(BR2_PACKAGE_LTTNG_BABELTRACE_DEBUG_INFO),y) Yes, that was my first solution. I changed it to the `depends` before submitting v1 because I didn't have such a complex `BR2_PACKAGE_LTTNG_BABELTRACE_DEBUG_INFO` block. Thanks for the tips, Phil > >> +LTTNG_BABELTRACE_DEPENDENCIES += elfutils >> +LTTNG_BABELTRACE_CONF_OPTS += --enable-debug-info >> +else >> +LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info >> +endif >> + >> $(eval $(autotools-package)) >> -$(eval $(host-autotools-package)) > > Regards, > Yann E. MORIN. > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------'
diff --git a/package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch b/package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch new file mode 100644 index 0000000..831a04c --- /dev/null +++ b/package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch @@ -0,0 +1,30 @@ +From d3cce60dfde30bd2fd67caa3fbc5f111131c243a Mon Sep 17 00:00:00 2001 +From: Philippe Proulx <eeppeliteloop@gmail.com> +Date: Fri, 28 Oct 2016 01:48:25 -0400 +Subject: [PATCH] configure.ac: remove elfutils version test for Buildroot + +The AX_LIB_ELFUTILS macro builds an executable file and executes it to +discover the version of elfutils. Obviously we cannot execute a +cross-compiled program here, hence this test is removed because we know +that elfutils's version is greater than 0.154 anyway in Buildroot. + +Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com> +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0b7bde2..f1bfe52 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -268,7 +268,6 @@ AS_IF([test "x$_enable_debug_info" = xyes], [ + # Check if libelf and libdw are present + AC_CHECK_LIB([elf], [elf_version], [], [AC_MSG_ERROR(Missing libelf (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)]) + AC_CHECK_LIB([dw], [dwarf_begin], [], [AC_MSG_ERROR(Missing libdw (from elfutils >= 0.154) which is required by debug info. You can disable this feature using --disable-debug-info.)]) +- AX_LIB_ELFUTILS([0], [154], [], [AC_MSG_ERROR(elfutils >= 0.154 is required to use the debug info feature. You can disable this feature using --disable-debug-info.)]) + AC_DEFINE([ENABLE_DEBUG_INFO], [1], [Define to 1 if you enable the 'debug info' feature]) + ], []) + +-- +2.9.3 + diff --git a/package/lttng-babeltrace/0001-no-posix-fallocate-in-uclibc.patch b/package/lttng-babeltrace/0001-no-posix-fallocate-in-uclibc.patch deleted file mode 100644 index d77825f..0000000 --- a/package/lttng-babeltrace/0001-no-posix-fallocate-in-uclibc.patch +++ /dev/null @@ -1,37 +0,0 @@ -Do not call posix_fallocate() on uClibc - -uClibc does not implement posix_fallocate(), and posix_fallocate() is -mostly only an hint to the kernel that we will need such or such -amount of space inside a file. So we just don't call posix_fallocate() -when building against uClibc. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -[Peter: add #include <features.h> ---- - formats/ctf/ctf.c | 3 +++ - 1 file changed, 3 insertions(+) - -Index: lttng-babeltrace-0.8/formats/ctf/ctf.c -=================================================================== ---- lttng-babeltrace-0.8.orig/formats/ctf/ctf.c -+++ lttng-babeltrace-0.8/formats/ctf/ctf.c -@@ -32,6 +32,7 @@ - #include <sys/stat.h> - #include <fcntl.h> - #include <dirent.h> -+#include <features.h> - #include <glib.h> - #include <unistd.h> - #include <stdlib.h> -@@ -384,9 +385,11 @@ - } - pos->content_size = -1U; /* Unknown at this point */ - pos->packet_size = WRITE_PACKET_LEN; -+#ifndef __UCLIBC__ - off = posix_fallocate(pos->fd, pos->mmap_offset, - pos->packet_size / CHAR_BIT); - assert(off >= 0); -+#endif - pos->offset = 0; - } else { - read_next_packet: diff --git a/package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch b/package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch deleted file mode 100644 index 849c0a3..0000000 --- a/package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 670d0961a823df0db28f39a354430f3dc2519418 Mon Sep 17 00:00:00 2001 -From: Samuel Martin <s.martin49@gmail.com> -Date: Sat, 28 May 2016 12:53:33 +0200 -Subject: [PATCH] configure: fix uuid support detection on static build - -This change adds uuid support detection using pkg-config, before falling -back on default AC_CHECK_LIB calls. - -Using flags from pkg-config is useful for static build, because they -also include dependency flags; whereas - -AC_CHECK_LIB function achieves its test by trying to link against the -requested library, without taking care of its dependency -requirements/flags. Therefore, in case of static build, it can fail on -the uuid detection like [1], because the uuid's dependency flags -(regarding gettext) are missing. -Instead, using pkg-config to do the check will take care of getting and -setting all required flags. - -This change adds uuid detection using pkg-config helper before falling -back on the standard AC_CHECK_LIB detection for platforms missing -pkg-config. - -This issue [1] has been triggered on Buildroot farms. - -[1] http://autobuild.buildroot.net/results/43b/43b98ddf9eb44152ed9ac4a98d887af14831d8da/build-end.log - -Signed-off-by: Samuel Martin <s.martin49@gmail.com> ---- - configure.ac | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 632fe39..b344fa8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -65,6 +65,15 @@ esac - AM_CONDITIONAL([BABELTRACE_BUILD_WITH_MINGW], [test "x$MINGW32" = "xyes"]) - - # Check for libuuid -+PKG_CHECK_MODULES([UUID], [uuid], -+[ -+ LIBS="${UUID_LIBS} ${LIBS}" -+ CFLAGS="${CFLAGS} ${UUID_CFLAGS}" -+ AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.]) -+ have_libuuid=yes -+], -+[ -+# try detecting libuuid without pkg-config - AC_CHECK_LIB([uuid], [uuid_generate], - [ - AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.]) -@@ -83,6 +92,7 @@ AC_CHECK_LIB([uuid], [uuid_generate], - AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.]) - fi - ]) -+]) - ] - ) - AM_CONDITIONAL([BABELTRACE_BUILD_WITH_LIBUUID], [test "x$have_libuuid" = "xyes"]) --- -2.8.3 - diff --git a/package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch b/package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch new file mode 100644 index 0000000..641835c --- /dev/null +++ b/package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch @@ -0,0 +1,36 @@ +From 27e37d2621317d25e08ba0683bf8540b05b9347d Mon Sep 17 00:00:00 2001 +From: Philippe Proulx <eeppeliteloop@gmail.com> +Date: Fri, 28 Oct 2016 02:09:20 -0400 +Subject: [PATCH] tests/lib/Makefile.am: remove unneeded -static flag + +Having those -static flags breaks the build in shared-only builds. + +Upstream does not even know why those flags are passed here, and they +are about to remove them as of this date. + +Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com> +--- + tests/lib/Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am +index 33ada16..c685e77 100644 +--- a/tests/lib/Makefile.am ++++ b/tests/lib/Makefile.am +@@ -31,13 +31,11 @@ check_SCRIPTS = test_seek_big_trace \ + test_ctf_writer_complete + + if ENABLE_DEBUG_INFO +-test_dwarf_LDFLAGS = -static + test_dwarf_LDADD = $(LIBTAP) \ + $(top_builddir)/lib/libbabeltrace.la \ + $(top_builddir)/lib/libdebug-info.la + test_dwarf_SOURCES = test_dwarf.c + +-test_bin_info_LDFLAGS = -static + test_bin_info_LDADD = $(LIBTAP) \ + $(top_builddir)/lib/libbabeltrace.la \ + $(top_builddir)/lib/libdebug-info.la +-- +2.9.3 + diff --git a/package/lttng-babeltrace/Config.in b/package/lttng-babeltrace/Config.in index d362779..8aafc6d 100644 --- a/package/lttng-babeltrace/Config.in +++ b/package/lttng-babeltrace/Config.in @@ -14,18 +14,19 @@ config BR2_PACKAGE_LTTNG_BABELTRACE to/from another trace format. Babeltrace is the reference implementation of the Common - Trace Format (see <http://diamon.org/docs/ctf/>). Babeltrace + Trace Format (see <http://diamon.org/ctf/>). Babeltrace can decode and display LTTng traces, since the latter are written using the CTF format. + The babeltrace utility is built with debug information + printing support when the elfutils package is selected. + Having this tool on the target is not mandatory. You can transfer the binary trace output from the target to your - development workstation, and use babeltrace here. Buildroot - automatically builds a host babeltrace in - $(O)/host/usr/bin/babeltrace as a dependency of the - lttng-tools package. + development workstation, and use babeltrace here. Babeltrace + is packaged for all major Linux distributions. - http://www.efficios.com/babeltrace + http://diamon.org/babeltrace comment "lttng-babeltrace needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU diff --git a/package/lttng-babeltrace/lttng-babeltrace.hash b/package/lttng-babeltrace/lttng-babeltrace.hash index a9f45b2..1b9633b 100644 --- a/package/lttng-babeltrace/lttng-babeltrace.hash +++ b/package/lttng-babeltrace/lttng-babeltrace.hash @@ -1,7 +1,6 @@ -# From http://lttng.org/files/babeltrace/babeltrace-1.2.4.tar.bz2.md5 -md5 20a806fa7570e69a91707855a98f3ca6 babeltrace-1.2.4.tar.bz2 -# From http://lttng.org/files/babeltrace/babeltrace-1.2.4.tar.bz2.sha1 -sha1 c72a80e8fd905cb1ae3b0cf88885517faafe0fa1 babeltrace-1.2.4.tar.bz2 +# From http://www.efficios.com/files/babeltrace/babeltrace-1.4.0.tar.bz2.md5 +md5 fa99064048af5c9c6ff00e489ac809c2 babeltrace-1.4.0.tar.bz2 +# From http://www.efficios.com/files/babeltrace/babeltrace-1.4.0.tar.bz2.sha1 +sha1 3b162480ee883625e8581bf163817f78a4b6487b babeltrace-1.4.0.tar.bz2 # Locally generated -sha256 666e3a1ad2dc7d5703059963056e7800f0eab59c8eeb6be2efe4f3acc5209eb1 babeltrace-1.2.4.tar.bz2 - +sha256 9469eeb22617cd12668683b04c27003e5337e9ac66ade914988df3642fc0d0e4 babeltrace-1.4.0.tar.bz2 diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk index b2e03a9..ced1024 100644 --- a/package/lttng-babeltrace/lttng-babeltrace.mk +++ b/package/lttng-babeltrace/lttng-babeltrace.mk @@ -4,18 +4,21 @@ # ################################################################################ -LTTNG_BABELTRACE_SITE = http://lttng.org/files/babeltrace -LTTNG_BABELTRACE_VERSION = 1.2.4 +LTTNG_BABELTRACE_SITE = http://www.efficios.com/files/babeltrace +LTTNG_BABELTRACE_VERSION = 1.4.0 LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2 LTTNG_BABELTRACE_LICENSE = MIT, LGPLv2.1 (include/babeltrace/list.h), GPLv2 (test code) LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE - LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2 host-pkgconf -HOST_LTTNG_BABELTRACE_DEPENDENCIES = \ - host-popt host-util-linux host-libglib2 host-pkgconf -# for 0002-configure-fix-uuid-support-detection-on-static-build.patch +# For 0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch LTTNG_BABELTRACE_AUTORECONF = YES +ifeq ($(BR2_PACKAGE_ELFUTILS),y) +LTTNG_BABELTRACE_DEPENDENCIES += elfutils +LTTNG_BABELTRACE_CONF_OPTS += --enable-debug-info +else +LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info +endif + $(eval $(autotools-package)) -$(eval $(host-autotools-package))
Current patches are dropped because they were merged upstream. Official Babeltrace's website changed from <http://www.efficios.com/babeltrace> to <http://diamon.org/babeltrace>. Official upstream site of Babeltrace for the distribution of tarballs changed from lttng.org to efficios.com (see <http://diamon.org/babeltrace>). I'm removing the host package build, as users can get Babeltrace on major Linux distributions using their package manager. Since Babeltrace 1.4, there is support for printing debug information along with compatible traces and event records. Babeltrace needs elfutils in this case. If elfutils exists in the BR image, then this feature is enabled. Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com> --- Changes v1 -> v2: - Detailed commit message. - Detailed patch messages. - Add comment above `LTTNG_BABELTRACE_AUTORECONF = YES` in `lttng-babeltrace.mk`. ...c-remove-elfutils-version-test-for-Buildr.patch | 30 +++++++++++ .../0001-no-posix-fallocate-in-uclibc.patch | 37 ------------- ...ix-uuid-support-detection-on-static-build.patch | 63 ---------------------- ...b-Makefile.am-remove-unneeded-static-flag.patch | 36 +++++++++++++ package/lttng-babeltrace/Config.in | 13 ++--- package/lttng-babeltrace/lttng-babeltrace.hash | 11 ++-- package/lttng-babeltrace/lttng-babeltrace.mk | 17 +++--- 7 files changed, 88 insertions(+), 119 deletions(-) create mode 100644 package/lttng-babeltrace/0001-configure.ac-remove-elfutils-version-test-for-Buildr.patch delete mode 100644 package/lttng-babeltrace/0001-no-posix-fallocate-in-uclibc.patch delete mode 100644 package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch create mode 100644 package/lttng-babeltrace/0002-tests-lib-Makefile.am-remove-unneeded-static-flag.patch -- 2.9.3