Add buildroot 2018-02
This commit is contained in:
Pascal Vizeli
@@ -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
|
||||
|
||||
21
buildroot/package/lttng-libust/Config.in
Normal file
21
buildroot/package/lttng-libust/Config.in
Normal file
@@ -0,0 +1,21 @@
|
||||
config BR2_PACKAGE_LTTNG_LIBUST
|
||||
bool "lttng-libust"
|
||||
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
|
||||
depends on !BR2_STATIC_LIBS
|
||||
select BR2_PACKAGE_LIBURCU
|
||||
select BR2_PACKAGE_UTIL_LINUX
|
||||
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
|
||||
help
|
||||
Userspace tracing library for the LTTng 2.x tracing
|
||||
infrastructure. It allows userspace programs to create
|
||||
custom trace events that are integrated with all other
|
||||
events gathered by LTTng.
|
||||
|
||||
http://lttng.org
|
||||
|
||||
comment "lttng-libust needs a toolchain w/ dynamic library, wchar, threads"
|
||||
depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
|
||||
depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
3
buildroot/package/lttng-libust/lttng-libust.hash
Normal file
3
buildroot/package/lttng-libust/lttng-libust.hash
Normal file
@@ -0,0 +1,3 @@
|
||||
# From http://lttng.org/files/lttng-ust/lttng-ust-2.10.1.tar.bz2.{md5,sha1}
|
||||
md5 4863cc2f9f0a070b42438bb646bbba06 lttng-ust-2.10.1.tar.bz2
|
||||
sha1 3779c9ed75e3fa532797431f2c47979ce73614a7 lttng-ust-2.10.1.tar.bz2
|
||||
29
buildroot/package/lttng-libust/lttng-libust.mk
Normal file
29
buildroot/package/lttng-libust/lttng-libust.mk
Normal file
@@ -0,0 +1,29 @@
|
||||
################################################################################
|
||||
#
|
||||
# lttng-libust
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
|
||||
LTTNG_LIBUST_VERSION = 2.10.1
|
||||
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 --disable-examples
|
||||
# 0001-configure.ac-add-disable-examples-option-to-not-buil.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