From patchwork Sun Dec 30 22:17:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 208795 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 D4CCC2C00A9 for ; Mon, 31 Dec 2012 09:18:14 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1527D1016E5; Sun, 30 Dec 2012 22:18:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EaJ1nth14qA8; Sun, 30 Dec 2012 22:18:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id BC13D100273; Sun, 30 Dec 2012 22:18:00 +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 94B058F74B for ; Sun, 30 Dec 2012 22:18:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A7C4E85B96 for ; Sun, 30 Dec 2012 22:18:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sgxt6VcfHbjx for ; Sun, 30 Dec 2012 22:18:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f175.google.com (mail-we0-f175.google.com [74.125.82.175]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6DB418576A for ; Sun, 30 Dec 2012 22:18:02 +0000 (UTC) Received: by mail-we0-f175.google.com with SMTP id z53so5674034wey.6 for ; Sun, 30 Dec 2012 14:18:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references; bh=FDHlRRsUxoy3klSbbnrtBCb1TWFTM7Mdha+B5GmWths=; b=OmYDIDsQoUQ+rr3vUpxZTfem75rpBpY9kx1fqCYq0yrp3XSMR2EQlye5oBlOqxLkND nnsK0I5vrTEPwgz+9+xy/W5owSZQHRMbeNOpv9eGc85e8VMqdHu9KLTil/8REwWoYuPX WH2LgOxnMaigEeXm38LYspNdBL64/Jj7zczh+t/1bB1aefnB3SK0ahZWOOjrmPDbAtFy TfF2Z297HyT8vqes5emM9dbho7Q+GBoLPoyUugJYJol8Iko20BSmsQH4dOL6ItsgooVm TdT8SIktN9X/vtDBX4IHuW2NB1OaJAXTHgERd74jTEDpbm5YJemPKcwrnEEzpbcLFPEV fYUQ== X-Received: by 10.180.24.133 with SMTP id u5mr52549060wif.17.1356905880604; Sun, 30 Dec 2012 14:18:00 -0800 (PST) Received: from localhost.localdomain (ANantes-557-1-155-237.w2-1.abo.wanadoo.fr. [2.1.170.237]) by mx.google.com with ESMTPS id p3sm73021735wic.8.2012.12.30.14.17.58 (version=SSLv3 cipher=OTHER); Sun, 30 Dec 2012 14:17:59 -0800 (PST) From: Samuel Martin To: buildroot@busybox.net Date: Sun, 30 Dec 2012 23:17:44 +0100 Message-Id: <10d124683f25769b7919e9bbe394c8d850fe4b23.1356905589.git.s.martin49@gmail.com> X-Mailer: git-send-email 1.8.0.3 In-Reply-To: References: In-Reply-To: References: Subject: [Buildroot] [PATCH 1/4] lttng-libust: bump to 2.1.0 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 Also remove lttng-libust-uclibc-sed_getcpu.patch because it got merged upstream. Signed-off-by: Samuel Martin --- ...t-dont-build-cxx-tests-when-not-available.patch | 13 +++++---- .../lttng-libust-uclibc-sched_getcpu.patch | 32 ---------------------- package/lttng-libust/lttng-libust.mk | 2 +- 3 files changed, 8 insertions(+), 39 deletions(-) delete mode 100644 package/lttng-libust/lttng-libust-uclibc-sched_getcpu.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 bcc5636..b7e8a8f 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 @@ -38,15 +38,16 @@ index 26227cb..56d84db 100644 +AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"]) + ## Checks for libraries. - AC_CHECK_LIB([dl], [dlopen]) - AC_CHECK_LIB([pthread], [pthread_create]) + AC_CHECK_LIB([dl], [dlopen], + [ diff --git a/tests/Makefile.am b/tests/Makefile.am -index e79ab7c..1a8b795 100644 +index 2b12422..7365ce4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -1,6 +1,10 @@ --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 +@@ -1,7 +1,11 @@ + SUBDIRS = . hello hello-static-lib fork ust-basic-tracing ust-multi-test \ +- demo hello.cxx daemon ++ demo daemon #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 diff --git a/package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch b/package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch deleted file mode 100644 index 6536185..0000000 --- a/package/lttng-libust/lttng-libust-uclibc-sched_getcpu.patch +++ /dev/null @@ -1,32 +0,0 @@ -[PATCH] fix build with modern uClibc - -uClibc has sched_getcpu since 0.9.33, so the compat workaround should only -be used for older uClibc versions. - -Signed-off-by: Peter Korsgaard ---- - liblttng-ust/compat.h | 5 +++++ - 1 file changed, 5 insertions(+) - -Index: lttng-ust-1.9.2/liblttng-ust/compat.h -=================================================================== ---- lttng-ust-1.9.2.orig/liblttng-ust/compat.h -+++ lttng-ust-1.9.2/liblttng-ust/compat.h -@@ -17,6 +17,10 @@ - #include - - #ifdef __UCLIBC__ -+/* old uClibc versions didn't have sched_getcpu */ -+#if __UCLIBC_MAJOR__ == 0 && \ -+ (__UCLIBC_MINOR__ < 9 || \ -+ (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) - #define __getcpu(cpu, node, cache) syscall(__NR_getcpu, cpu, node, cache) - static inline - int sched_getcpu(void) -@@ -26,5 +30,6 @@ - s = __getcpu(&c, NULL, NULL); - return (s == -1) ? s : c; - } -+#endif /* <= 0.9.32 */ - #endif /* __UCLIBC__ */ - #endif /* _UST_COMPAT_H */ diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk index cd6c65d..e1f51b1 100644 --- a/package/lttng-libust/lttng-libust.mk +++ b/package/lttng-libust/lttng-libust.mk @@ -4,7 +4,7 @@ # ############################################################# LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust/ -LTTNG_LIBUST_VERSION = 2.0.3 +LTTNG_LIBUST_VERSION = 2.1.0 LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 LTTNG_LIBUST_INSTALL_STAGING = YES