From patchwork Sat Sep 26 20:18:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1371861 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=D61bn66v; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BzKqS4J9nz9sS8 for ; Sun, 27 Sep 2020 06:18:40 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B7C2285CC3; Sat, 26 Sep 2020 20:18:38 +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 50s-xjNAu6BD; Sat, 26 Sep 2020 20:18:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 09B1E85B68; Sat, 26 Sep 2020 20:18:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id BFE221BF95A for ; Sat, 26 Sep 2020 20:18:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BC7B185B68 for ; Sat, 26 Sep 2020 20:18:36 +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 eW+BPPqA+Vyr for ; Sat, 26 Sep 2020 20:18:34 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6E2D3856ED for ; Sat, 26 Sep 2020 20:18:34 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id s12so7520975wrw.11 for ; Sat, 26 Sep 2020 13:18:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mqL1aRy2H3OWDGHK9K2qV5N5sqhQ95P1L69fdcHi10k=; b=D61bn66vq0wZPkOTKfAuZASuxyzImJbdzkvStmGyHUrH8jUMnvdEW3b4KSB+9Ku1cj la65Bz3vk+fBQT0bq2M94pRbTAzO0VEllkwtig1nWCgYTr6gFha97/tr1n1eVBSPesri XX6Dk3o9TTNHAxb/4qfWa0G6Z0LBqxLpNbCdy0vENgwN9t0+loPTPDX9vvVOY7J3Jbec 0FDZffdkbAvwqODjC5cQboZCVzaW4sDn20ZlCdTshg8Leh7vtHWuYdjB0UuU68b/Xr/o n+gwzXrAIFbbaE1266oakjR6Q14UkW3vfVANR1xEPU0SrCdz52jQnqBgKeRZQJwH4F5z 3hOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mqL1aRy2H3OWDGHK9K2qV5N5sqhQ95P1L69fdcHi10k=; b=a+1H9NT4qQGvPwWDNTM57LXXrYHdxwj0Du0y9j0agrj9bKv615DncYiVu0oiUoAgjD 4K51BZ95Sy4ButN2g4nfrhnTSWwhXsS4xVloWQJA+0gJT1b8ja3ENnF4s+3s26W6gXG5 7ZkJZiVXbgyRmXXNYUyjx+FMoBtSIQ1zZIqhk4GZeealuPXJ9uiW26r3XLWks+dQcjpF pV8UNJP77HX24aCaP6y8zH8UpJxKbNLOmi88lQHszDC9aITCyg6CJdpVr9IsFVTCI0q+ ZGWYhBscOOPI2INl7X6qBSv0GjXMrnYfyDGcA97veKyaa7BSTUaROvZCe7dkxZzYnPtW ZXSg== X-Gm-Message-State: AOAM531Uk3w8SgPctgXNGN7BPlGWM6cBbyfygEVW+VIF6TqVpDRpOxX0 AJMSJb5FmzjitTlCpaLku4m23rV83Es= X-Google-Smtp-Source: ABdhPJxgNlClZqcBDwWCCGEFmUdhHc9h1IsjsTvACYY6D6aqWGh+Zt0GaY3spl9DlR1M7mXKmFK2/A== X-Received: by 2002:adf:ce05:: with SMTP id p5mr10714803wrn.110.1601151512377; Sat, 26 Sep 2020 13:18:32 -0700 (PDT) Received: from kali.home (2a01cb0881b76d0062c55ff6bf2a37aa.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:62c5:5ff6:bf2a:37aa]) by smtp.gmail.com with ESMTPSA id l126sm3628262wmf.39.2020.09.26.13.18.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2020 13:18:31 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 26 Sep 2020 22:18:17 +0200 Message-Id: <20200926201817.996329-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/babeltrace2: fix tests with uclibc X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Philippe Proulx , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" It should be noted that upstream does not want to add a --disable-tests option: https://review.lttng.org/c/babeltrace/+/4075 Fixes: - http://autobuild.buildroot.org/results/1e50e1ff90c1ac2af2223365dc0cd6e1914bcd75 Signed-off-by: Fabrice Fontaine --- ...trace_ir_ref.c-rename-user-structure.patch | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch diff --git a/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch b/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch new file mode 100644 index 0000000000..ac9eee82d8 --- /dev/null +++ b/package/babeltrace2/0002-tests-lib-test_trace_ir_ref.c-rename-user-structure.patch @@ -0,0 +1,57 @@ +From 7a27f13c192d15cae47740f3e884bba16f15ed41 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 26 Sep 2020 22:03:10 +0200 +Subject: [PATCH] tests/lib/test_trace_ir_ref.c: rename user structure + +Rename user structure to bt_user to avoid the following build failure +with uclibc: + +test_trace_ir_ref.c:41:8: error: redefinition of 'struct user' + struct user { + ^ +In file included from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/procfs.h:33, + from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/ucontext.h:25, + from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/signal.h:329, + from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib/gbacktrace.h:36, + from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib.h:34, + from ../../src/common/assert.h:28, + from ../../src/lib/object.h:28, + from test_trace_ir_ref.c:25: +/home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/user.h:48:8: note: originally defined here + struct user + ^~~~ + +Fixes: + - http://autobuild.buildroot.org/results/e4229e2b9c892b419a9d2eaa6929b80ea62dd130 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/efficios/babeltrace/pull/115] +--- + tests/lib/test_trace_ir_ref.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/lib/test_trace_ir_ref.c b/tests/lib/test_trace_ir_ref.c +index d5dfa9cf..70caf29c 100644 +--- a/tests/lib/test_trace_ir_ref.c ++++ b/tests/lib/test_trace_ir_ref.c +@@ -25,7 +25,7 @@ + + #define NR_TESTS 37 + +-struct user { ++struct bt_user { + bt_trace_class *tc; + bt_stream_class *sc; + bt_event_class *ec; +@@ -265,7 +265,7 @@ static void test_example_scenario(bt_self_component_source *self_comp) + bt_stream_class *weak_sc1 = NULL, *weak_sc2 = NULL; + bt_event_class *weak_ec1 = NULL, *weak_ec2 = NULL, + *weak_ec3 = NULL; +- struct user user_a = { 0 }, user_b = { 0 }, user_c = { 0 }; ++ struct bt_user user_a = { 0 }, user_b = { 0 }, user_c = { 0 }; + + /* The only reference which exists at this point is on TC1. */ + tc1 = create_tc1(self_comp); +-- +2.28.0 +