From patchwork Sat Jun 2 22:09:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 162462 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 0295DB6EEB for ; Sun, 3 Jun 2012 08:10:34 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DB3991014B5; Sat, 2 Jun 2012 22:10:33 +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 B+6FSQ455fe0; Sat, 2 Jun 2012 22:10:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 290CA10049E; Sat, 2 Jun 2012 22:10:25 +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 171168F753 for ; Sat, 2 Jun 2012 22:10:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AC37A8CEF0 for ; Sat, 2 Jun 2012 22:10:23 +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 7PYg-C02flPn for ; Sat, 2 Jun 2012 22:10:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by whitealder.osuosl.org (Postfix) with ESMTPS id 85F768CD2E for ; Sat, 2 Jun 2012 22:10:19 +0000 (UTC) Received: by wibhn14 with SMTP id hn14so1434809wib.10 for ; Sat, 02 Jun 2012 15:10:17 -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=L3l39Kf9Hsksv/AhvsMPhFQDsyZYqeU+Y9jjrLwUhNg=; b=E6/+ofKm2Lec3EQWKZkTOebLp/EA1927W4ffArlXqXPwKEaTFsWRJ7F993447aNQUH JM9kvtjPYOMfcplen0pmB8dHITDLU2O4yF0K9ZnUTm2X9gFdMsC7WsQjl1kNfvIAJD86 8B6gmijHmXGYa/pJjxaiorPba3UR4pUjJ9v0u76MZSUTzmEqGunqRyO5o7afGYtJ75FP Avtl/8fz/4FGkiUr5jMzycfK7HV+E0M3S+8tJiOaBYEg0xGmaDuG5J8CG2WL6ruawkUl Gqlj12cVt4ZJJj61p3JlKqXyRZiEv3gONdUcrJXGIEfo/FP4+XXjPdWQaTy000wVrvuA GVoQ== Received: by 10.216.197.38 with SMTP id s38mr5680550wen.205.1338675017380; Sat, 02 Jun 2012 15:10:17 -0700 (PDT) Received: from localhost.localdomain (ivr94-4-82-229-165-48.fbx.proxad.net. [82.229.165.48]) by mx.google.com with ESMTPS id ez4sm7984884wid.3.2012.06.02.15.10.15 (version=SSLv3 cipher=OTHER); Sat, 02 Jun 2012 15:10:16 -0700 (PDT) From: Samuel Martin To: buildroot@busybox.net Date: Sun, 3 Jun 2012 00:09:16 +0200 Message-Id: <1338674958-1972-2-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 1.7.10.3 In-Reply-To: <1338674958-1972-1-git-send-email-s.martin49@gmail.com> References: <1338674958-1972-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH v3 2/4] lttng-libust: bump to version 2.0.3 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 Changes since v2: - bump to version 2.0.3 Changes since v1: - bump to version 2.0.2 - update patch Signed-off-by: Samuel Martin delete mode 100644 package/lttng-libust/lttng-libust-fix-overflow-32-bits.patch --- 1.7.10.3 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..4f0414c 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.3 +LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 LTTNG_LIBUST_INSTALL_STAGING = YES LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux