* [Buildroot] [PATCH v2 2/4] lttng-libust: bump version to 2.10.0
2017-11-22 22:56 [Buildroot] [PATCH v2 1/4] lttng-modules: bump version to 2.10.4 Philippe Proulx
@ 2017-11-22 22:56 ` Philippe Proulx
2017-11-22 22:56 ` [Buildroot] [PATCH v2 3/4] lttng-tools: fix build errors and warnings for musl/uClibc-ng Philippe Proulx
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Philippe Proulx @ 2017-11-22 22:56 UTC (permalink / raw)
To: buildroot
The deleted patches are removed because they are now upstream as of
LTTng-UST v2.10.0.
Adding 0001-configure.ac-add-disable-examples-option-to-not-buil.patch
which will be part of a release eventually (in master branch as of this
date) to add the --disable-examples option. This option configures the
build so that examples are not built, so as to avoid build problems with
examples which involve CMake.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
---
Changes v1 -> v2:
- Fix tarball hashes.
...c-add-disable-examples-option-to-not-buil.patch | 68 +++++++++++
...lf.c-define-NT_GNU_BUILD_ID-if-not-define.patch | 34 ------
...s-Makefile.am-define-C-and-C-compilers-fo.patch | 49 --------
...the-presence-of-dlmopen-at-configure-time.patch | 130 ---------------------
...-include-config.h-to-resolve-HAVE_DLMOPEN.patch | 30 -----
package/lttng-libust/lttng-libust.hash | 6 +-
package/lttng-libust/lttng-libust.mk | 7 +-
7 files changed, 74 insertions(+), 250 deletions(-)
create mode 100644 package/lttng-libust/0001-configure.ac-add-disable-examples-option-to-not-buil.patch
delete mode 100644 package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch
delete mode 100644 package/lttng-libust/0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch
delete mode 100644 package/lttng-libust/0003-Validate-the-presence-of-dlmopen-at-configure-time.patch
delete mode 100644 package/lttng-libust/0004-Fix-include-config.h-to-resolve-HAVE_DLMOPEN.patch
diff --git a/package/lttng-libust/0001-configure.ac-add-disable-examples-option-to-not-buil.patch b/package/lttng-libust/0001-configure.ac-add-disable-examples-option-to-not-buil.patch
new file mode 100644
index 0000000000..ef817e44bb
--- /dev/null
+++ b/package/lttng-libust/0001-configure.ac-add-disable-examples-option-to-not-buil.patch
@@ -0,0 +1,68 @@
+From 08aa9a26779d4ede3de7857fafd03bd6331ba948 Mon Sep 17 00:00:00 2001
+From: Philippe Proulx <eeppeliteloop@gmail.com>
+Date: Mon, 6 Nov 2017 15:46:03 -0500
+Subject: [PATCH] configure.ac: add --disable-examples option to not
+ build/install examples
+
+Some environments and distributions do not need the LTTng-UST examples
+to be built because they remove them anyway. Continue to build them by
+default, but add --disable-examples to explicitly disable them.
+
+Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
+[Philippe: backport from upstream commit 08aa9a26]
+Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+---
+ configure.ac | 16 ++++++++++++++++
+ doc/Makefile.am | 6 +++++-
+ 2 files changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 10087f3f..68f41315 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -423,6 +423,19 @@ AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"],
+ AC_CHECK_PROG([BUILD_GEN_TP_EXAMPLES], [python], ["yes"])
+ AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test "x$BUILD_GEN_TP_EXAMPLES" = "xyes"])
+
++# Enable building examples
++AC_ARG_ENABLE(
++ examples,
++ AS_HELP_STRING(
++ [--disable-examples],
++ [Do not build and install examples]
++ ),
++ [enable_examples=$enableval],
++ [enable_examples=yes]
++)
++
++AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" != "xno"])
++
+ # Set $IN_GIT_REPO if we're in the Git repository; the `bootstrap` file
+ # is not distributed in tarballs.
+ AS_IF([test -f "$srcdir/bootstrap"], [in_git_repo=yes], [in_git_repo=no])
+@@ -596,6 +609,9 @@ PPRINT_PROP_BOOL([NUMA], $value)
+ AS_ECHO
+ PPRINT_SET_INDENT(0)
+
++test "x$enable_examples" = xyes && value=1 || value=0
++PPRINT_PROP_BOOL([Build and install examples], $value, $PPRINT_COLOR_SUBTITLE)
++
+ # man pages build enabled/disabled
+ m4_pushdef([build_man_pages_msg], [Build and install man pages])
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index e110ed85..a67c8c22 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,3 +1,7 @@
+-SUBDIRS = . man examples
++SUBDIRS = . man
++
++if ENABLE_EXAMPLES
++SUBDIRS += examples
++endif
+
+ dist_doc_DATA = java-agent.txt
+--
+2.15.0
+
diff --git a/package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch b/package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch
deleted file mode 100644
index 2e0c8b1da0..0000000000
--- a/package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d400314757a8d5d52bd5722d263bfd5886bb6595 Mon Sep 17 00:00:00 2001
-From: Philippe Proulx <eeppeliteloop@gmail.com>
-Date: Sat, 29 Oct 2016 13:32:57 -0400
-Subject: [PATCH] lttng-ust-elf.c: define NT_GNU_BUILD_ID if not defined
-
-On uClibc, NT_GNU_BUILD_ID is not defined, so we define it
-manually in this case.
-
-Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
-[Philippe: grabbed from this pull request:
- https://github.com/lttng/lttng-ust/pull/39
-]
----
- liblttng-ust/lttng-ust-elf.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/liblttng-ust/lttng-ust-elf.c b/liblttng-ust/lttng-ust-elf.c
-index 5f27920..beaa7f3 100644
---- a/liblttng-ust/lttng-ust-elf.c
-+++ b/liblttng-ust/lttng-ust-elf.c
-@@ -29,6 +29,10 @@
-
- #define BUF_LEN 4096
-
-+#ifndef NT_GNU_BUILD_ID
-+# define NT_GNU_BUILD_ID 3
-+#endif
-+
- /*
- * Retrieve the nth (where n is the `index` argument) phdr (program
- * header) from the given elf instance.
---
-2.9.3
-
diff --git a/package/lttng-libust/0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch b/package/lttng-libust/0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch
deleted file mode 100644
index 5172dbbf20..0000000000
--- a/package/lttng-libust/0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From f54894580da85e33f934c5c9bf5ab32d3fcce18b Mon Sep 17 00:00:00 2001
-From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-Date: Wed, 30 Nov 2016 16:52:51 +0000
-Subject: [PATCH] doc/examples/Makefile.am: define C and C++ compilers for
- CMake
-
-This prevents build failures when cross-compiling.
-
-If we don't define the compiler, it will use the one from the host
-machine. For instance "/usr/bin/c++", which is incorrect.
-
-The failure looks like this:
-
-.............................................................
-[ 10%] Building CXX object CMakeFiles/tracepoint-provider.dir/tracepoint-provider.cpp.o
-/usr/bin/c++ -Dtracepoint_provider_EXPORTS -I/br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/. -isystem /br/output/build/lttng-libust-2.9.0/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -o CMakeFiles/tracepoint-provider.dir/tracepoint-provider.cpp.o -c /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.cpp
-In file included from /br/output/build/lttng-libust-2.9.0/include/lttng/tracepoint.h:29:0,
- from /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h:32,
- from /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.cpp:26:
-/br/output/build/lttng-libust-2.9.0/include/lttng/tracepoint-rcu.h:26:27: fatal error: urcu/compiler.h: No such file or directory
- #include <urcu/compiler.h>
- ^
-compilation terminated.
-.............................................................
-
-Pull request URL: https://github.com/lttng/lttng-ust/pull/41
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
----
- doc/examples/Makefile.am | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
-index 424b844..5bc1f4c 100644
---- a/doc/examples/Makefile.am
-+++ b/doc/examples/Makefile.am
-@@ -152,7 +152,9 @@ all-local:
- cmake \
- -DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \
- -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" \
-+ -DCMAKE_C_COMPILER="$(CC)" \
- -DCMAKE_C_FLAGS="$(CFLAGS) $(CPPFLAGS)" \
-+ -DCMAKE_CXX_COMPILER="$(CXX)" \
- -DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
- -DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
- .. && \
---
-2.10.1
-
diff --git a/package/lttng-libust/0003-Validate-the-presence-of-dlmopen-at-configure-time.patch b/package/lttng-libust/0003-Validate-the-presence-of-dlmopen-at-configure-time.patch
deleted file mode 100644
index 699f1e0327..0000000000
--- a/package/lttng-libust/0003-Validate-the-presence-of-dlmopen-at-configure-time.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 42330adcefcd1830dad89e2a960c93d8dd1da125 Mon Sep 17 00:00:00 2001
-From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
-Date: Tue, 21 Feb 2017 16:00:27 -0500
-Subject: [PATCH] Validate the presence of dlmopen at configure time
-
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
-Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-[Backport from upstream commit 42330adcefcd1830dad89e2a960c93d8dd1da125.]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.ac | 8 ++++++++
- liblttng-ust-dl/lttng-ust-dl.c | 8 ++++++++
- liblttng-ust-dl/ust_dl.h | 2 ++
- 3 files changed, 18 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 450b43b..023cfd4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -125,15 +125,23 @@ AS_IF([test "x${ax_cv_sys_weak_alias}" = "xno"], [
- # Checks for libraries.
- AC_CHECK_LIB([dl], [dlopen], [
- have_libdl=yes
-+ libdl_name=dl
- ], [
- #libdl not found, check for dlopen in libc.
- AC_CHECK_LIB([c], [dlopen], [
- have_libc_dl=yes
-+ libdl_name=c
- ], [
- AC_MSG_ERROR([Cannot find dlopen in libdl nor libc. Use [LDFLAGS]=-Ldir to specify their location.])
- ])
- ])
-
-+# Check if libdl has dlmopen support.
-+AH_TEMPLATE([HAVE_DLMOPEN], ["Define to 1 if dlmopen is available."])
-+AC_CHECK_LIB([$libdl_name], [dlmopen],
-+ [AC_DEFINE([HAVE_DLMOPEN], [1])]
-+)
-+
- AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBDL], [test "x$have_libdl" = "xyes"])
- AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_DL], [test "x$have_libc_dl" = "xyes"])
-
-diff --git a/liblttng-ust-dl/lttng-ust-dl.c b/liblttng-ust-dl/lttng-ust-dl.c
-index b0737b6..ce2ae0e 100644
---- a/liblttng-ust-dl/lttng-ust-dl.c
-+++ b/liblttng-ust-dl/lttng-ust-dl.c
-@@ -38,8 +38,10 @@
- #include "ust_dl.h"
-
- static void *(*__lttng_ust_plibc_dlopen)(const char *filename, int flags);
-+#ifdef HAVE_DLMOPEN
- static void *(*__lttng_ust_plibc_dlmopen)(Lmid_t nsid, const char *filename,
- int flags);
-+#endif
- static int (*__lttng_ust_plibc_dlclose)(void *handle);
-
- static
-@@ -55,6 +57,7 @@ void *_lttng_ust_dl_libc_dlopen(const char *filename, int flags)
- return __lttng_ust_plibc_dlopen(filename, flags);
- }
-
-+#ifdef HAVE_DLMOPEN
- static
- void *_lttng_ust_dl_libc_dlmopen(Lmid_t nsid, const char *filename,
- int flags)
-@@ -68,6 +71,7 @@ void *_lttng_ust_dl_libc_dlmopen(Lmid_t nsid, const char *filename,
- }
- return __lttng_ust_plibc_dlmopen(nsid, filename, flags);
- }
-+#endif
-
- static
- int _lttng_ust_dl_libc_dlclose(void *handle)
-@@ -143,6 +147,7 @@ end:
- return;
- }
-
-+#ifdef HAVE_DLMOPEN
- static
- void lttng_ust_dl_dlmopen(void *so_base, Lmid_t nsid, const char *so_name,
- int flags, void *ip)
-@@ -203,6 +208,7 @@ end:
- lttng_ust_elf_destroy(elf);
- return;
- }
-+#endif
-
- void *dlopen(const char *filename, int flags)
- {
-@@ -223,6 +229,7 @@ void *dlopen(const char *filename, int flags)
- return handle;
- }
-
-+#ifdef HAVE_DLMOPEN
- void *dlmopen(Lmid_t nsid, const char *filename, int flags)
- {
- void *handle;
-@@ -243,6 +250,7 @@ void *dlmopen(Lmid_t nsid, const char *filename, int flags)
- return handle;
-
- }
-+#endif
-
- int dlclose(void *handle)
- {
-diff --git a/liblttng-ust-dl/ust_dl.h b/liblttng-ust-dl/ust_dl.h
-index b8cfe82..afa8e84 100644
---- a/liblttng-ust-dl/ust_dl.h
-+++ b/liblttng-ust-dl/ust_dl.h
-@@ -51,6 +51,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, dlopen,
- )
- )
-
-+#ifdef HAVE_DLMOPEN
- TRACEPOINT_EVENT(lttng_ust_dl, dlmopen,
- TP_ARGS(void *, ip, void *, baddr, Lmid_t, nsid,
- const char *, path, int, flags,
-@@ -66,6 +67,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, dlmopen,
- ctf_integer(uint8_t, has_debug_link, has_debug_link)
- )
- )
-+#endif
-
- TRACEPOINT_EVENT(lttng_ust_dl, build_id,
- TP_ARGS(
---
-2.7.4
-
diff --git a/package/lttng-libust/0004-Fix-include-config.h-to-resolve-HAVE_DLMOPEN.patch b/package/lttng-libust/0004-Fix-include-config.h-to-resolve-HAVE_DLMOPEN.patch
deleted file mode 100644
index 734d3c4c4a..0000000000
--- a/package/lttng-libust/0004-Fix-include-config.h-to-resolve-HAVE_DLMOPEN.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0b2253f5c9af73904d49da32085036c16b9d2d75 Mon Sep 17 00:00:00 2001
-From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
-Date: Tue, 21 Feb 2017 18:10:11 -0500
-Subject: [PATCH] Fix: include config.h to resolve HAVE_DLMOPEN
-
-Fixes commit 42330adcefcd1830dad89e2a960c93d8dd1da125
-
-Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-[Backported from upstream commit 0b2253f5c9af73904d49da32085036c16b9d2d75.]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- liblttng-ust-dl/ust_dl.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/liblttng-ust-dl/ust_dl.h b/liblttng-ust-dl/ust_dl.h
-index afa8e84..c8a0695 100644
---- a/liblttng-ust-dl/ust_dl.h
-+++ b/liblttng-ust-dl/ust_dl.h
-@@ -33,6 +33,7 @@ extern "C" {
-
- #include <stdint.h>
- #include <unistd.h>
-+#include <config.h>
-
- #define LTTNG_UST_DL_PROVIDER
- #include <lttng/tracepoint.h>
---
-2.7.4
-
diff --git a/package/lttng-libust/lttng-libust.hash b/package/lttng-libust/lttng-libust.hash
index e080361a57..897bcf6299 100644
--- a/package/lttng-libust/lttng-libust.hash
+++ b/package/lttng-libust/lttng-libust.hash
@@ -1,3 +1,3 @@
-# From http://lttng.org/files/lttng-ust/lttng-ust-2.9.0.tar.bz2.{md5,sha1}
-md5 77f3378ba37a36801420bce87b702e9c lttng-ust-2.9.0.tar.bz2
-sha1 9937eae64540821b8597cce081e92be76e6b5568 lttng-ust-2.9.0.tar.bz2
+# From http://lttng.org/files/lttng-ust/lttng-ust-2.10.0.tar.bz2.{md5,sha1}
+md5 8c539bc749c4533877095aa4c0f3cee8 lttng-ust-2.10.0.tar.bz2
+sha1 40fd9f1f405d155fe27a699cf44b87c768a20e7e lttng-ust-2.10.0.tar.bz2
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index 82923ded1f..5496e926d5 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -5,15 +5,14 @@
################################################################################
LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
-LTTNG_LIBUST_VERSION = 2.9.0
+LTTNG_LIBUST_VERSION = 2.10.0
LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
LTTNG_LIBUST_LICENSE = LGPL-2.1, MIT (system headers), GPL-2.0 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond)
LTTNG_LIBUST_LICENSE_FILES = COPYING
LTTNG_LIBUST_INSTALL_STAGING = YES
LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
-LTTNG_LIBUST_CONF_OPTS += --disable-man-pages
-# 0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch
-# 0003-Validate-the-presence-of-dlmopen-at-configure-time.patch
+LTTNG_LIBUST_CONF_OPTS += --disable-man-pages --disable-examples
+# 0001-configure.ac-add-disable-examples-option-to-not-buil.patch
LTTNG_LIBUST_AUTORECONF = YES
ifeq ($(BR2_PACKAGE_PYTHON),y)
--
2.15.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH v2 3/4] lttng-tools: fix build errors and warnings for musl/uClibc-ng
2017-11-22 22:56 [Buildroot] [PATCH v2 1/4] lttng-modules: bump version to 2.10.4 Philippe Proulx
2017-11-22 22:56 ` [Buildroot] [PATCH v2 2/4] lttng-libust: bump version to 2.10.0 Philippe Proulx
@ 2017-11-22 22:56 ` Philippe Proulx
2017-11-23 20:10 ` Thomas Petazzoni
2017-11-22 22:56 ` [Buildroot] [PATCH v2 4/4] lttng-tools: bump to version 2.10.1 Philippe Proulx
2017-12-01 21:21 ` [Buildroot] [PATCH v2 1/4] lttng-modules: bump version to 2.10.4 Thomas Petazzoni
3 siblings, 1 reply; 6+ messages in thread
From: Philippe Proulx @ 2017-11-22 22:56 UTC (permalink / raw)
To: buildroot
Add 0001-Fix-detect-dlmopen-and-disable-corresponding-tests-i.patch to
detect if dlmopen() exists and disable parts of the build accordingly if
not. This fixes a bug when building with musl or uClibc-ng.
Add 0002-Fix-src-common-pipe.h-include-sys-types.h-for-ssize_.patch to
fix an #include bug when building with musl.
Add 0003-Fix-warning-src-bin-lttng-utils.c-cast-incompatible-.patch to
remove compilation warnings.
All three new patches are in upstream's master branch as of this date
and will be part of an eventual release.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
---
Changes v1 -> v2:
- New patch in v2, which was part of a single patch which also
bumped the package's version. Now this patch only includes the fixes
and another patch bumps the version.
...dlmopen-and-disable-corresponding-tests-i.patch | 249 +++++++++++++++++++++
...mon-pipe.h-include-sys-types.h-for-ssize_.patch | 31 +++
...-src-bin-lttng-utils.c-cast-incompatible-.patch | 32 +++
package/lttng-tools/lttng-tools.mk | 3 +-
4 files changed, 314 insertions(+), 1 deletion(-)
create mode 100644 package/lttng-tools/0001-Fix-detect-dlmopen-and-disable-corresponding-tests-i.patch
create mode 100644 package/lttng-tools/0002-Fix-src-common-pipe.h-include-sys-types.h-for-ssize_.patch
create mode 100644 package/lttng-tools/0003-Fix-warning-src-bin-lttng-utils.c-cast-incompatible-.patch
diff --git a/package/lttng-tools/0001-Fix-detect-dlmopen-and-disable-corresponding-tests-i.patch b/package/lttng-tools/0001-Fix-detect-dlmopen-and-disable-corresponding-tests-i.patch
new file mode 100644
index 0000000000..8e14a14413
--- /dev/null
+++ b/package/lttng-tools/0001-Fix-detect-dlmopen-and-disable-corresponding-tests-i.patch
@@ -0,0 +1,249 @@
+From bc1d8ca01415710d40224de312c7ecf6f4223301 Mon Sep 17 00:00:00 2001
+From: Philippe Proulx <eeppeliteloop@gmail.com>
+Date: Mon, 6 Nov 2017 18:46:41 -0500
+Subject: [PATCH] Fix: detect dlmopen() and disable corresponding tests if not
+ available
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+musl and uClibc-ng are known not to support dlmopen(). LTTng-UST has
+this dlmopen() detection.
+
+Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
+[Philippe: backport from upstream commit bc1d8ca0
+ edited to remove .gitignore part]
+Signed-off-by: J?r?mie Galarneau <jeremie.galarneau@efficios.com>
+---
+ .gitignore | 1 +
+ configure.ac | 25 ++++++++++++++++++++++
+ tests/regression/ust/ust-dl/prog.c | 17 +++++++++++++--
+ tests/regression/ust/ust-dl/test_ust-dl | 32 ----------------------------
+ tests/regression/ust/ust-dl/test_ust-dl.in | 34 ++++++++++++++++++++++++++++++
+ tests/regression/ust/ust-dl/test_ust-dl.py | 9 +++++++-
+ tests/utils/test_utils.py | 3 +++
+ 7 files changed, 86 insertions(+), 35 deletions(-)
+ delete mode 100755 tests/regression/ust/ust-dl/test_ust-dl
+ create mode 100644 tests/regression/ust/ust-dl/test_ust-dl.in
+
+diff --git a/configure.ac b/configure.ac
+index 016c56ec..b6ea39c5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -196,6 +196,30 @@ AC_CHECK_FUNCS([ \
+ # add -lrt to LIBS
+ AC_CHECK_LIB([rt], [clock_gettime, timer_create, timer_settime, timer_delete])
+
++# Checks for dl.
++AC_CHECK_LIB([dl], [dlopen], [
++ have_libdl=yes
++ libdl_name=dl
++], [
++ # libdl not found, check for dlopen in libc.
++ AC_CHECK_LIB([c], [dlopen], [
++ have_libc_dl=yes
++ libdl_name=c
++ ], [
++ AC_MSG_ERROR([Cannot find dlopen in libdl nor libc. Use [LDFLAGS]=-Ldir to specify their location.])
++ ])
++])
++
++# Check if libdl has dlmopen support.
++AH_TEMPLATE([HAVE_DLMOPEN], ["Define to 1 if dlmopen is available."])
++AC_CHECK_LIB([$libdl_name], [dlmopen], [
++ AC_DEFINE([HAVE_DLMOPEN], [1])
++ HAVE_DLMOPEN=1
++], [
++ HAVE_DLMOPEN=0
++])
++AC_SUBST(HAVE_DLMOPEN)
++
+ # Babeltrace viewer check
+ AC_ARG_WITH([babeltrace-bin],
+ AS_HELP_STRING([--with-babeltrace-bin],
+@@ -1100,6 +1124,7 @@ AC_CONFIG_FILES([
+ AC_CONFIG_FILES([tests/regression/ust/python-logging/test_python_logging],[chmod +x tests/regression/ust/python-logging/test_python_logging])
+ # Inject LTTNG_TOOLS_BUILD_WITH_LIBPFM variable in test script.
+ AC_CONFIG_FILES([tests/perf/test_perf_raw],[chmod +x tests/perf/test_perf_raw])
++AC_CONFIG_FILES([tests/regression/ust/ust-dl/test_ust-dl],[chmod +x tests/regression/ust/ust-dl/test_ust-dl])
+
+ AC_OUTPUT
+
+diff --git a/tests/regression/ust/ust-dl/prog.c b/tests/regression/ust/ust-dl/prog.c
+index e8e4b264..669792d9 100644
+--- a/tests/regression/ust/ust-dl/prog.c
++++ b/tests/regression/ust/ust-dl/prog.c
+@@ -13,7 +13,12 @@
+ */
+ int main(int argc, char **argv)
+ {
+- void *h0, *h1, *h2, *h3, *h4;
++ void *h0, *h2, *h3, *h4;
++
++#ifdef HAVE_DLMOPEN
++ void *h1;
++#endif
++
+ char *error;
+ int (*foo)(void);
+
+@@ -21,10 +26,14 @@ int main(int argc, char **argv)
+ if (!h0) {
+ goto get_error;
+ }
++
++#ifdef HAVE_DLMOPEN
+ h1 = dlmopen(LM_ID_BASE, "libfoo.so", RTLD_LAZY);
+ if (!h1) {
+ goto get_error;
+ }
++#endif
++
+ h2 = dlopen("libzzz.so", RTLD_LAZY);
+ if (!h2) {
+ goto get_error;
+@@ -38,7 +47,7 @@ int main(int argc, char **argv)
+ goto get_error;
+ }
+
+- foo = dlsym(h1, "foo");
++ foo = dlsym(h3, "foo");
+ error = dlerror();
+ if (error != NULL) {
+ goto error;
+@@ -49,9 +58,13 @@ int main(int argc, char **argv)
+ if (dlclose(h0)) {
+ goto get_error;
+ }
++
++#ifdef HAVE_DLMOPEN
+ if (dlclose(h1)) {
+ goto get_error;
+ }
++#endif
++
+ if (dlclose(h2)) {
+ goto get_error;
+ }
+diff --git a/tests/regression/ust/ust-dl/test_ust-dl b/tests/regression/ust/ust-dl/test_ust-dl
+deleted file mode 100755
+index 1f2934db..00000000
+--- a/tests/regression/ust/ust-dl/test_ust-dl
++++ /dev/null
+@@ -1,32 +0,0 @@
+-#!/bin/bash
+-#
+-# Copyright (C) - 2013 J?r?mie Galarneau <jeremie.galarneau@efficios.com>
+-#
+-# This program is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License, version 2 only, as
+-# published by the Free Software Foundation.
+-#
+-# This program is distributed in the hope that it will be useful, but WITHOUT
+-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+-# more details.
+-#
+-# You should have received a copy of the GNU General Public License along with
+-# this program; if not, write to the Free Software Foundation, Inc., 51
+-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-
+-CURDIR=$(dirname $0)
+-TESTDIR=${CURDIR}/../../..
+-
+-source $TESTDIR/utils/utils.sh
+-
+-if [ ! -x "$CURDIR/.libs/libfoo.so" ]; then
+- diag "No shared object generated. Skipping all tests."
+- exit 0
+-fi
+-
+-start_lttng_sessiond_notap
+-
+-python3 ${CURDIR}/test_ust-dl.py
+-
+-stop_lttng_sessiond_notap
+diff --git a/tests/regression/ust/ust-dl/test_ust-dl.in b/tests/regression/ust/ust-dl/test_ust-dl.in
+new file mode 100644
+index 00000000..61d00d21
+--- /dev/null
++++ b/tests/regression/ust/ust-dl/test_ust-dl.in
+@@ -0,0 +1,34 @@
++#!/bin/bash
++#
++# Copyright (C) - 2013 J?r?mie Galarneau <jeremie.galarneau@efficios.com>
++#
++# This program is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License, version 2 only, as
++# published by the Free Software Foundation.
++#
++# This program is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
++# more details.
++#
++# You should have received a copy of the GNU General Public License along with
++# this program; if not, write to the Free Software Foundation, Inc., 51
++# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++
++CURDIR=$(dirname $0)
++TESTDIR=${CURDIR}/../../..
++
++source $TESTDIR/utils/utils.sh
++
++if [ ! -x "$CURDIR/.libs/libfoo.so" ]; then
++ diag "No shared object generated. Skipping all tests."
++ exit 0
++fi
++
++export LTTNG_TOOLS_HAVE_DLMOPEN=@HAVE_DLMOPEN@
++
++start_lttng_sessiond_notap
++
++python3 ${CURDIR}/test_ust-dl.py
++
++stop_lttng_sessiond_notap
+diff --git a/tests/regression/ust/ust-dl/test_ust-dl.py b/tests/regression/ust/ust-dl/test_ust-dl.py
+index 81972a7d..72459840 100644
+--- a/tests/regression/ust/ust-dl/test_ust-dl.py
++++ b/tests/regression/ust/ust-dl/test_ust-dl.py
+@@ -31,6 +31,9 @@ sys.path.append(test_utils_path)
+ from test_utils import *
+
+
++have_dlmopen = (os.environ.get('LTTNG_TOOLS_HAVE_DLMOPEN') == '1')
++
++
+ NR_TESTS = 14
+ current_test = 1
+ print("1..{0}".format(NR_TESTS))
+@@ -113,7 +116,11 @@ current_test += 1
+ print_test_result(dlopen_event_found > 0, current_test, "lttng_ust_dl:dlopen event found in resulting trace")
+ current_test += 1
+
+-print_test_result(dlmopen_event_found > 0, current_test, "lttng_ust_dl:dlmopen event found in resulting trace")
++if have_dlmopen:
++ print_test_result(dlmopen_event_found > 0, current_test, "lttng_ust_dl:dlmopen event found in resulting trace")
++else:
++ skip_test(current_test, 'dlmopen() is not available')
++
+ current_test += 1
+
+ print_test_result(build_id_event_found > 0, current_test, "lttng_ust_dl:build_id event found in resulting trace")
+diff --git a/tests/utils/test_utils.py b/tests/utils/test_utils.py
+index 4b38630c..02e632a2 100644
+--- a/tests/utils/test_utils.py
++++ b/tests/utils/test_utils.py
+@@ -62,6 +62,9 @@ def print_test_result(result, number, description):
+ result_string += " {0} - {1}".format(number, description)
+ print(result_string)
+
++def skip_test(number, description):
++ print('ok {} # skip {}'.format(number, description))
++
+ def enable_ust_tracepoint_event(session_info, event_name):
+ event = Event()
+ event.name = event_name
+--
+2.15.0
+
diff --git a/package/lttng-tools/0002-Fix-src-common-pipe.h-include-sys-types.h-for-ssize_.patch b/package/lttng-tools/0002-Fix-src-common-pipe.h-include-sys-types.h-for-ssize_.patch
new file mode 100644
index 0000000000..914947684d
--- /dev/null
+++ b/package/lttng-tools/0002-Fix-src-common-pipe.h-include-sys-types.h-for-ssize_.patch
@@ -0,0 +1,31 @@
+From 40dde31f7eeb71af169b97b82d8fd1739895dfc3 Mon Sep 17 00:00:00 2001
+From: Philippe Proulx <eeppeliteloop@gmail.com>
+Date: Wed, 8 Nov 2017 15:19:24 -0500
+Subject: [PATCH] Fix: src/common/pipe.h: include <sys/types.h> for ssize_t and
+ mode_t
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
+[Philippe: backport from upstream commit 40dde31f]
+Signed-off-by: J?r?mie Galarneau <jeremie.galarneau@efficios.com>
+---
+ src/common/pipe.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/common/pipe.h b/src/common/pipe.h
+index 2d4fc967..30f7c3f3 100644
+--- a/src/common/pipe.h
++++ b/src/common/pipe.h
+@@ -20,6 +20,7 @@
+
+ #include <pthread.h>
+ #include <common/macros.h>
++#include <sys/types.h>
+
+ enum lttng_pipe_state {
+ LTTNG_PIPE_STATE_OPENED = 1,
+--
+2.15.0
+
diff --git a/package/lttng-tools/0003-Fix-warning-src-bin-lttng-utils.c-cast-incompatible-.patch b/package/lttng-tools/0003-Fix-warning-src-bin-lttng-utils.c-cast-incompatible-.patch
new file mode 100644
index 0000000000..b353b8f48a
--- /dev/null
+++ b/package/lttng-tools/0003-Fix-warning-src-bin-lttng-utils.c-cast-incompatible-.patch
@@ -0,0 +1,32 @@
+From 56efeab366da412ee4196107c08174f32ed83c9a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
+ <jeremie.galarneau@efficios.com>
+Date: Mon, 13 Nov 2017 10:31:29 -0500
+Subject: [PATCH] Fix warning: src/bin/lttng/utils.c: cast incompatible pointer
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Reported-by: Philippe Proulx <eeppeliteloop@gmail.com>
+[Philippe: backport from upstream commit 56efeab3]
+Signed-off-by: J?r?mie Galarneau <jeremie.galarneau@efficios.com>
+---
+ src/bin/lttng/utils.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c
+index 885f498b..52a2440e 100644
+--- a/src/bin/lttng/utils.c
++++ b/src/bin/lttng/utils.c
+@@ -387,7 +387,7 @@ int check_relayd(void)
+ * A successful connect means the relayd exists thus returning 0 else a
+ * negative value means it does NOT exists.
+ */
+- ret = connect(fd, &sin, sizeof(sin));
++ ret = connect(fd, (struct sockaddr *) &sin, sizeof(sin));
+ if (ret < 0) {
+ /* Not found. */
+ ret = 0;
+--
+2.15.0
+
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index 776750c63e..f0c5febafd 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -10,7 +10,8 @@ LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
LTTNG_TOOLS_LICENSE = GPL-2.0+, LGPL-2.1+ (include/lttng/*, src/lib/lttng-ctl/*)
LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE
LTTNG_TOOLS_CONF_OPTS += --disable-man-pages
-
+# 0001-Fix-detect-dlmopen-and-disable-corresponding-tests-i.patch
+LTTNG_LIBUST_AUTORECONF = YES
LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt util-linux
ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y)
--
2.15.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH v2 3/4] lttng-tools: fix build errors and warnings for musl/uClibc-ng
2017-11-22 22:56 ` [Buildroot] [PATCH v2 3/4] lttng-tools: fix build errors and warnings for musl/uClibc-ng Philippe Proulx
@ 2017-11-23 20:10 ` Thomas Petazzoni
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2017-11-23 20:10 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 22 Nov 2017 17:56:36 -0500, Philippe Proulx wrote:
> Add 0001-Fix-detect-dlmopen-and-disable-corresponding-tests-i.patch to
> detect if dlmopen() exists and disable parts of the build accordingly if
> not. This fixes a bug when building with musl or uClibc-ng.
>
> Add 0002-Fix-src-common-pipe.h-include-sys-types.h-for-ssize_.patch to
> fix an #include bug when building with musl.
>
> Add 0003-Fix-warning-src-bin-lttng-utils.c-cast-incompatible-.patch to
> remove compilation warnings.
>
> All three new patches are in upstream's master branch as of this date
> and will be part of an eventual release.
>
> Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
> ---
> Changes v1 -> v2:
> - New patch in v2, which was part of a single patch which also
> bumped the package's version. Now this patch only includes the fixes
> and another patch bumps the version.
Why was this patch 3/4 in the series? It should have been the first
patch: it's the one fixing a build issue, and the one we want to apply
on master. So I've applied just this patch to master.
Also, there was no reference to the autobuilder failure being fixed, so
I've added that as well.
Thanks a lot!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2 4/4] lttng-tools: bump to version 2.10.1
2017-11-22 22:56 [Buildroot] [PATCH v2 1/4] lttng-modules: bump version to 2.10.4 Philippe Proulx
2017-11-22 22:56 ` [Buildroot] [PATCH v2 2/4] lttng-libust: bump version to 2.10.0 Philippe Proulx
2017-11-22 22:56 ` [Buildroot] [PATCH v2 3/4] lttng-tools: fix build errors and warnings for musl/uClibc-ng Philippe Proulx
@ 2017-11-22 22:56 ` Philippe Proulx
2017-12-01 21:21 ` [Buildroot] [PATCH v2 1/4] lttng-modules: bump version to 2.10.4 Thomas Petazzoni
3 siblings, 0 replies; 6+ messages in thread
From: Philippe Proulx @ 2017-11-22 22:56 UTC (permalink / raw)
To: buildroot
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
---
Changes v1 -> v2:
- Only bump the package's version in this patch, and put the required
fixes in another patch.
package/lttng-tools/lttng-tools.hash | 6 +++---
package/lttng-tools/lttng-tools.mk | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/lttng-tools/lttng-tools.hash b/package/lttng-tools/lttng-tools.hash
index 8a4c2ebda4..51742525bc 100644
--- a/package/lttng-tools/lttng-tools.hash
+++ b/package/lttng-tools/lttng-tools.hash
@@ -1,3 +1,3 @@
-# From http://lttng.org/files/lttng-tools/lttng-tools-2.9.5.tar.bz2.{md5,sha1}
-md5 051224eb991aee07f8721ff1877d0b96 lttng-tools-2.9.5.tar.bz2
-sha1 b988b237f34baa3916242dc9141aa61470e99dfd lttng-tools-2.9.5.tar.bz2
+# From http://lttng.org/files/lttng-tools/lttng-tools-2.10.1.tar.bz2.{md5,sha1}
+md5 fd80fa64dffd8017fb30836eb30532cc lttng-tools-2.10.1.tar.bz2
+sha1 b29554903160dc1c89b41c85493fd968de0e624f lttng-tools-2.10.1.tar.bz2
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index f0c5febafd..68781ba19d 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LTTNG_TOOLS_VERSION = 2.9.5
+LTTNG_TOOLS_VERSION = 2.10.1
LTTNG_TOOLS_SITE = http://lttng.org/files/lttng-tools
LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
LTTNG_TOOLS_LICENSE = GPL-2.0+, LGPL-2.1+ (include/lttng/*, src/lib/lttng-ctl/*)
--
2.15.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH v2 1/4] lttng-modules: bump version to 2.10.4
2017-11-22 22:56 [Buildroot] [PATCH v2 1/4] lttng-modules: bump version to 2.10.4 Philippe Proulx
` (2 preceding siblings ...)
2017-11-22 22:56 ` [Buildroot] [PATCH v2 4/4] lttng-tools: bump to version 2.10.1 Philippe Proulx
@ 2017-12-01 21:21 ` Thomas Petazzoni
3 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2017-12-01 21:21 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 22 Nov 2017 17:56:34 -0500, Philippe Proulx wrote:
> Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
> ---
> Changes v1 -> v2:
> - Nothing changed.
Applied patches 1, 2 and 4 to master. Patch 3 had already been applied.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread