Bump buildroot to version 2017-02
TG-3 #closed
This commit is contained in:
@@ -0,0 +1,34 @@
|
||||
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
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
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
|
||||
|
||||
@@ -3,7 +3,7 @@ config BR2_PACKAGE_LTTNG_LIBUST
|
||||
select BR2_PACKAGE_LIBURCU
|
||||
select BR2_PACKAGE_UTIL_LINUX
|
||||
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
|
||||
depends on BR2_USE_WCHAR # util-linux
|
||||
depends on BR2_USE_WCHAR # uses wchar_t
|
||||
# liburcu only works on some architectures and requires threads support"
|
||||
depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
# http://www.lttng.org/files/lttng-ust/lttng-ust-2.7.1.tar.bz2.sha1
|
||||
sha1 597ebecb885debb58c263de57f30b1096d4eefc6 lttng-ust-2.7.1.tar.bz2
|
||||
|
||||
# Locally computed
|
||||
sha1 2e79c98e458b2e052930fb81441e6ca8377a2ed7 787364e8bac9a146f9d65c763633c2b75eb76463.patch
|
||||
sha1 cf77ec415111f77573be7917d9b62d8e49dc6304 30307a67b48641875b122d8f832bbfb454e95d92.patch
|
||||
# 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
|
||||
|
||||
@@ -5,24 +5,25 @@
|
||||
################################################################################
|
||||
|
||||
LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
|
||||
LTTNG_LIBUST_VERSION = 2.7.1
|
||||
LTTNG_LIBUST_VERSION = 2.9.0
|
||||
LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
|
||||
LTTNG_LIBUST_LICENSE = LGPLv2.1, MIT (system headers), GPLv2 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond)
|
||||
LTTNG_LIBUST_LICENSE_FILES = COPYING
|
||||
|
||||
LTTNG_LIBUST_PATCH = \
|
||||
https://github.com/lttng/lttng-ust/commit/787364e8bac9a146f9d65c763633c2b75eb76463.patch \
|
||||
https://github.com/lttng/lttng-ust/commit/30307a67b48641875b122d8f832bbfb454e95d92.patch
|
||||
|
||||
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
|
||||
LTTNG_LIBUST_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PYTHON),y)
|
||||
LTTNG_LIBUST_DEPENDENCIES += python
|
||||
LTTNG_LIBUST_CONF_OPTS += --enable-python-agent
|
||||
else ifeq ($(BR2_PACKAGE_PYTHON3),y)
|
||||
LTTNG_LIBUST_DEPENDENCIES += python3
|
||||
LTTNG_LIBUST_CONF_OPTS += --enable-python-agent
|
||||
else
|
||||
LTTNG_LIBUST_CONF_ENV = am_cv_pathless_PYTHON="none"
|
||||
LTTNG_LIBUST_CONF_OPTS += --disable-python-agent
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user