From patchwork Tue May 8 13:41:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 157684 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 91EDEB6FA1 for ; Tue, 8 May 2012 23:42:57 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9799D100499; Tue, 8 May 2012 13:42:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ECkXwTAce6bc; Tue, 8 May 2012 13:42:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4253410037C; Tue, 8 May 2012 13:42:52 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 44F708F753 for ; Tue, 8 May 2012 13:42:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 311308D676 for ; Tue, 8 May 2012 13:42:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vycrUTH5XNsY for ; Tue, 8 May 2012 13:42:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ey0-f171.google.com (mail-ey0-f171.google.com [209.85.215.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id ED3218D5BE for ; Tue, 8 May 2012 13:42:47 +0000 (UTC) Received: by eaal11 with SMTP id l11so2459908eaa.16 for ; Tue, 08 May 2012 06:42:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=lwe4rrh00trfd843lJ8Dk3RpaTmMx2eBPok2a2BI5m4=; b=Uy/m8vWDkS1lG2bvLOUagGf28Lyos7yHM0yfJn4WqlDR92t9UUvTcZ/WE3RPjDlknz pa6AUFbqoC4/hV75dr4JbUhD2UB7mcV+h2S6KFedoqzTChWvJybldz3z7jZDjN84Ns6g HKHsle9CyGupHEzFLaDDLk+TQqy0gmXk/ybm3VX6f2sapLDVY7VqS6OP7UXDCD80KxGo 9VqdgP9PqkcKByXpA4mAVyfdSSgKi1W3ytE7LSnLODQgEaQHCXY8ieXk95uuNX/K11Oe ipinX6tov9LMPe1tcFiMuMkU1ytq8k4V2pvwJdLXxWWZ5emVict7VLngBudOMMoG+QaG f+vw== Received: by 10.213.26.74 with SMTP id d10mr2902184ebc.89.1336484565966; Tue, 08 May 2012 06:42:45 -0700 (PDT) Received: from samuel-laptop.home (ANantes-555-1-155-54.w2-1.abo.wanadoo.fr. [2.1.234.54]) by mx.google.com with ESMTPS id y53sm102684378eea.3.2012.05.08.06.42.43 (version=SSLv3 cipher=OTHER); Tue, 08 May 2012 06:42:44 -0700 (PDT) From: Samuel Martin To: buildroot@busybox.net Date: Tue, 8 May 2012 15:41:52 +0200 Message-Id: <1336484514-17578-1-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <87vckmamle.fsf@macbook.be.48ers.dk> References: <87vckmamle.fsf@macbook.be.48ers.dk> Subject: [Buildroot] [PATCH 1/3] lttng-libust: bump to version 2.0.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Samuel Martin --- ...t-dont-build-cxx-tests-when-not-available.patch | 45 ++++++++++++-------- .../lttng-libust-fix-overflow-32-bits.patch | 26 ----------- package/lttng-libust/lttng-libust.mk | 11 +++-- 3 files changed, 36 insertions(+), 46 deletions(-) delete mode 100644 package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch diff --git a/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch b/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch index d7be22d..437ccca 100644 --- a/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch +++ b/package/lttng-libust/lttng-libust-dont-build-cxx-tests-when-not-available.patch @@ -1,19 +1,27 @@ -Do not build C++ example if a C++ compiler isn't available +From 01dfa6e944d083db994f0a1165d3124bb6875437 Mon Sep 17 00:00:00 2001 +From: Samuel Martin +Date: Tue, 8 May 2012 15:13:21 +0200 +Subject: [PATCH 1/1] don't build C++ example if a C++ compiler isn't + available By default lttng-ust builds a hello.cxx C++ example that demonstrates -the usage of the userspace tracing library in a C++ -program. Unfortunately, when no C++ support is available, the build -of lttng-ust fails just because of this example code. So we make the -compilation of this code conditional on whether a working C++ compiler -was found. +the usage of the userspace tracing library in a C++ program. +Unfortunately, when no C++ support is available, the build of lttng-ust +fails just because of this example code. So we make the compilation of +this code conditional on whether a working C++ compiler was found. Signed-off-by: Thomas Petazzoni +Signed-off-by: Samuel Martin +--- + configure.ac | 12 ++++++++++++ + tests/Makefile.am | 6 +++++- + 2 files changed, 17 insertions(+), 1 deletion(-) -Index: lttng-ust-1.9.2/configure.ac -=================================================================== ---- lttng-ust-1.9.2.orig/configure.ac 2012-02-04 14:49:45.387325814 +0100 -+++ lttng-ust-1.9.2/configure.ac 2012-02-04 14:50:08.156920117 +0100 -@@ -38,6 +38,18 @@ +diff --git a/configure.ac b/configure.ac +index 26227cb..56d84db 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -45,6 +45,18 @@ AC_PROG_CXX AC_PROG_MAKE_SET LT_INIT @@ -32,13 +40,13 @@ Index: lttng-ust-1.9.2/configure.ac ## Checks for libraries. AC_CHECK_LIB([dl], [dlopen]) AC_CHECK_LIB([pthread], [pthread_create]) -Index: lttng-ust-1.9.2/tests/Makefile.am -=================================================================== ---- lttng-ust-1.9.2.orig/tests/Makefile.am 2012-02-04 14:49:49.157258640 +0100 -+++ lttng-ust-1.9.2/tests/Makefile.am 2012-02-04 14:50:15.096796474 +0100 +diff --git a/tests/Makefile.am b/tests/Makefile.am +index e79ab7c..1a8b795 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am @@ -1,6 +1,10 @@ --SUBDIRS = . hello fork ust-basic-tracing ust-multi-test demo hello.cxx -+SUBDIRS = . hello fork ust-basic-tracing ust-multi-test demo +-SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test demo hello.cxx ++SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test demo #SUBDIRS = . hello2 basic basic_long simple_include snprintf test-nevents test-libustinstr-malloc dlopen same_line_marker trace_event register_test tracepoint libustctl_function_tests exit-fast +if CXX_WORKS @@ -48,3 +56,6 @@ Index: lttng-ust-1.9.2/tests/Makefile.am dist_noinst_SCRIPTS = test_loop runtests trace_matches noinst_LIBRARIES = libtap.a +-- +1.7.10.1 + diff --git a/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch b/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch deleted file mode 100644 index c2a4dd2..0000000 --- a/package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch +++ /dev/null @@ -1,26 +0,0 @@ -From dc190cc1f8ddccfa7b0b8323ed157afb29a0ebb7 Mon Sep 17 00:00:00 2001 -From: Mathieu Desnoyers -Date: Wed, 21 Dec 2011 16:24:48 -0500 -Subject: [PATCH] Fix clock source overflow on 32-bit archs - -Signed-off-by: Mathieu Desnoyers ---- - liblttng-ust/clock.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/liblttng-ust/clock.h b/liblttng-ust/clock.h -index b5d3e77..23294d2 100644 ---- a/liblttng-ust/clock.h -+++ b/liblttng-ust/clock.h -@@ -39,7 +39,7 @@ static __inline__ uint64_t trace_clock_read64(void) - struct timespec ts; - - clock_gettime(CLOCK_MONOTONIC, &ts); -- return (ts.tv_sec * 1000000000) + ts.tv_nsec; -+ return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec; - } - - static __inline__ uint32_t trace_clock_freq_scale(void) --- -1.7.2.5 - diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk index f54999e..81bffe9 100644 --- a/package/lttng-libust/lttng-libust.mk +++ b/package/lttng-libust/lttng-libust.mk @@ -1,6 +1,11 @@ -LTTNG_LIBUST_SITE = http://lttng.org/files/bundles/20111214/ -LTTNG_LIBUST_VERSION = 1.9.2 -LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.gz +############################################################# +# +# LTTng-UST: the userspace tracing library +# +############################################################# +LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust/ +LTTNG_LIBUST_VERSION = 2.0.2 +LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 LTTNG_LIBUST_INSTALL_STAGING = YES LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux